Merge pull request appium#1448 from snevesbarros/call_method_of_null_fix

fix for issue 1445.
clymerrm · Nov 9, 2013 · 4e51d79 · 4e51d79
2 parents a5a201f + 25b164d
commit 4e51d79
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/appium.js b/lib/appium.js
@@ -665,7 +665,7 @@ Appium.prototype.stop = function(cb) {
   logger.info('Shutting down appium session...');
   if (this.isSafariLauncherApp === true) {
     this.device.leaveWebView(function() {
-      if (this.device.udid === null) {
+      if (this.device.udid === null && this.device.instruments !== null) {
         this.device.instruments.shutdown(function() {
           this.cleanupSession(null, cb);
         }.bind(this));