diff --git a/src/Facades/FacadeClassMapper.php b/src/Facades/FacadeClassMapper.php
index 5d318f25..103a55a5 100644
--- a/src/Facades/FacadeClassMapper.php
+++ b/src/Facades/FacadeClassMapper.php
@@ -179,7 +179,7 @@ public static function OtherAntiPatternNameEntity(){
          'OtherContact' => 'GenericContactType',
          'CheckPayment' => 'BillPaymentCheck',
          'CheckDetail' => 'CheckPayment',
-         'CreditCardPayment' => 'BillPaymentCreditCard',
+         'CreditCardPayment' => 'CreditCardPayment',
          'CashBack' => 'CashBackInfo',
          'ItemGroupLine' => 'ItemComponentLine',
          'ItemAssemblyLine' => 'ItemComponentLine',
diff --git a/src/XSD2PHP/src/com/mikebevz/xsd2php/Bind.php b/src/XSD2PHP/src/com/mikebevz/xsd2php/Bind.php
index addf3013..c92edb6b 100644
--- a/src/XSD2PHP/src/com/mikebevz/xsd2php/Bind.php
+++ b/src/XSD2PHP/src/com/mikebevz/xsd2php/Bind.php
@@ -130,6 +130,9 @@ public function bindXml($xml, $model)
                 list($ns, $name) = $this->parseQName($child->nodeName, true);
                 //$className = $this->urnToPhpName($ns)."\\".$name;
                 try {
+                    if (!$refl->hasProperty($name)) {
+                        continue;
+                    }
                     $propertyDocs = $refl->getProperty($name)->getDocComment();
                 } catch (\ReflectionException $e) {
                     throw new \RuntimeException($e->getMessage() . ". Class " . get_class($model));