diff --git a/Libraries/CustomComponents/ListView/ListView.js b/Libraries/CustomComponents/ListView/ListView.js
index d25ae38ba76..496ff4bb247 100644
--- a/Libraries/CustomComponents/ListView/ListView.js
+++ b/Libraries/CustomComponents/ListView/ListView.js
@@ -221,7 +221,9 @@ var ListView = React.createClass({
    * such as scrollTo.
    */
   getScrollResponder: function() {
-    return this.refs[SCROLLVIEW_REF].getScrollResponder();
+    return this.refs[SCROLLVIEW_REF] &&
+      this.refs[SCROLLVIEW_REF].getScrollResponder &&
+      this.refs[SCROLLVIEW_REF].getScrollResponder();
   },
 
   setNativeProps: function(props) {
@@ -400,6 +402,9 @@ var ListView = React.createClass({
 
   _measureAndUpdateScrollProps: function() {
     var scrollComponent = this.getScrollResponder();
+    if (!scrollComponent || !scrollComponent.getInnerViewNode) {
+      return;
+    }
     RCTUIManager.measureLayout(
       scrollComponent.getInnerViewNode(),
       React.findNodeHandle(scrollComponent),
diff --git a/Libraries/Utilities/MessageQueue.js b/Libraries/Utilities/MessageQueue.js
index 7163b1caf43..195f6ff2626 100644
--- a/Libraries/Utilities/MessageQueue.js
+++ b/Libraries/Utilities/MessageQueue.js
@@ -157,8 +157,8 @@ class MessageQueue {
     let callback = this._callbacks[cbID];
     if (__DEV__) {
       let debug = this._debugInfo[cbID >> 1];
-      let module = this._remoteModuleTable[debug[0]];
-      let method = this._remoteMethodTable[debug[0]][debug[1]];
+      let module = debug && this._remoteModuleTable[debug[0]];
+      let method = debug && this._remoteMethodTable[debug[0]][debug[1]];
       if (!callback) {
         console.error(`Callback with id ${cbID}: ${module}.${method}() not found`);
       } else if (SPY_MODE) {