diff --git a/src/FirebaseArray.js b/src/FirebaseArray.js index e6744c32..e1f9ddb7 100644 --- a/src/FirebaseArray.js +++ b/src/FirebaseArray.js @@ -667,7 +667,9 @@ var isResolved = false; var error = $firebaseUtils.batch(function(err) { _initComplete(err); - firebaseArray.$$error(err); + if( firebaseArray ) { + firebaseArray.$$error(err); + } }); var initComplete = $firebaseUtils.batch(_initComplete); diff --git a/src/FirebaseObject.js b/src/FirebaseObject.js index c5d21dcd..cad03f31 100644 --- a/src/FirebaseObject.js +++ b/src/FirebaseObject.js @@ -446,7 +446,12 @@ firebaseObject.$$notify(); } }); - var error = $firebaseUtils.batch(firebaseObject.$$error, firebaseObject); + var error = $firebaseUtils.batch(function(err) { + _initComplete(err); + if( firebaseObject ) { + firebaseObject.$$error(err); + } + }); var initComplete = $firebaseUtils.batch(_initComplete); var sync = {