diff --git a/src/core/ReactCompositeComponent.js b/src/core/ReactCompositeComponent.js
index 5144319476..9b010f80b5 100644
--- a/src/core/ReactCompositeComponent.js
+++ b/src/core/ReactCompositeComponent.js
@@ -1181,7 +1181,7 @@ var ReactCompositeComponentMixin = {
       invariant(
         ReactDescriptor.isValidDescriptor(renderedComponent),
         '%s.render(): A valid ReactComponent must be returned. You may have ' +
-          'returned an array or some other invalid object.',
+          'returned undefined, an array or some other invalid object.',
         this.constructor.displayName || 'ReactCompositeComponent'
       );
       return renderedComponent;
diff --git a/src/core/__tests__/ReactCompositeComponent-test.js b/src/core/__tests__/ReactCompositeComponent-test.js
index 911578e216..add279580f 100644
--- a/src/core/__tests__/ReactCompositeComponent-test.js
+++ b/src/core/__tests__/ReactCompositeComponent-test.js
@@ -159,8 +159,8 @@ describe('ReactCompositeComponent', function() {
       ReactTestUtils.renderIntoDocument(<Component />);
     }).toThrow(
       'Invariant Violation: Component.render(): A valid ReactComponent must ' +
-      'be returned. You may have returned an array or some other invalid ' +
-      'object.'
+      'be returned. You may have returned undefined, an array or some other ' +
+      'invalid object.'
     );
   });