Merge pull request mui#1651 from louy/master

[Card] Fix a potential error in <Card>
tyfoo · Oct 21, 2015 · 4e29f27 · 4e29f27
2 parents ca207c4 + c69a57e
commit 4e29f27
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/card/card.jsx b/src/card/card.jsx
@@ -31,7 +31,7 @@ const Card = React.createClass({
       let newChild = undefined;
       let newProps = {};
       let element = currentChild;
-      if (!currentChild) {
+      if (!currentChild || !currentChild.props) {
         return null;
       }
       if (this.state.expanded === false && currentChild.props.expandable === true)