diff --git a/src/browser/ui/ReactDOMComponent.js b/src/browser/ui/ReactDOMComponent.js
index 5b1eface68fc1..db483c44ecece 100644
--- a/src/browser/ui/ReactDOMComponent.js
+++ b/src/browser/ui/ReactDOMComponent.js
@@ -144,12 +144,9 @@ ReactDOMComponent.Mixin = {
         continue;
       }
       var propValue = props[propKey];
-      if (propValue == null) {
-        continue;
-      }
       if (registrationNameModules[propKey]) {
         putListener(this._rootNodeID, propKey, propValue, transaction);
-      } else {
+      } else if (propValue != null) {
         if (propKey === STYLE) {
           if (propValue) {
             propValue = props.style = merge(props.style);
diff --git a/src/event/EventPluginHub.js b/src/event/EventPluginHub.js
index 92c72618ccca5..66472193bcad6 100644
--- a/src/event/EventPluginHub.js
+++ b/src/event/EventPluginHub.js
@@ -159,7 +159,7 @@ var EventPluginHub = {
       'Cannot call putListener() in a non-DOM environment.'
     );
     invariant(
-      !listener || typeof listener === 'function',
+      typeof listener === 'function',
       'Expected %s listener to be a function, instead got type %s',
       registrationName, typeof listener
     );