diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee
index d954d10f..d13b074a 100644
--- a/assets/scripts/app/auth.coffee
+++ b/assets/scripts/app/auth.coffee
@@ -18,7 +18,8 @@
         user.send('rollback')
       user.unloadRecord()
     Travis.__container__.lookup('controller:currentUser').set('content', null)
-    Travis.__container__.lookup('router:main').send('afterSignOut')
+    if router = Travis.__container__.lookup('router:main')
+      router.send('afterSignOut')
 
   signIn: (data) ->
     if data
diff --git a/assets/scripts/spec/spec_helper.coffee b/assets/scripts/spec/spec_helper.coffee
index 8a9e01b0..540a4214 100644
--- a/assets/scripts/spec/spec_helper.coffee
+++ b/assets/scripts/spec/spec_helper.coffee
@@ -12,12 +12,12 @@ minispade.require 'app'
     token: 'abcdef'
 
 @app = (url, options = {}) ->
+  Travis.auth.signOut()
   # TODO: this should wait till app is initialized, not some
   #       arbitrary amount of time
   waits(50)
   runs ->
     Travis.reset()
-    Travis.auth.signOut()
 
     if options.user
       signInUser()