diff --git a/assets/scripts/app/auth.coffee b/assets/scripts/app/auth.coffee
index bfd30825..b025f4fa 100644
--- a/assets/scripts/app/auth.coffee
+++ b/assets/scripts/app/auth.coffee
@@ -13,10 +13,10 @@
     Travis.setLocale Travis.default_locale
     @set('state', 'signed-out')
     @set('user', undefined)
-    user = Travis.__container__.lookup('controller:currentUser').get('content')
-    if user.get('stateManager.currentPath') == 'rootState.loaded.updated.uncommitted'
-      user.send('rollback')
-    user.unloadRecord()
+    if user = Travis.__container__.lookup('controller:currentUser').get('content')
+      if user.get('stateManager.currentPath') == 'rootState.loaded.updated.uncommitted'
+        user.send('rollback')
+      user.unloadRecord()
     Travis.__container__.lookup('controller:currentUser').set('content', null)
     Travis.__container__.lookup('router:main').send('afterSignOut')
 
diff --git a/assets/scripts/spec/build_spec.coffee b/assets/scripts/spec/build_spec.coffee
index 8c42674c..dfd7a5a8 100644
--- a/assets/scripts/spec/build_spec.coffee
+++ b/assets/scripts/spec/build_spec.coffee
@@ -2,10 +2,8 @@ describe 'on the "build" state', ->
   beforeEach ->
     app '/travis-ci/travis-core/builds/1'
 
-    console.log 'wait for repos'
     waitFor reposRendered
     runs ->
-      console.log 'wait for build'
       waitFor buildRendered
 
   it 'displays the expected stuff', ->
diff --git a/assets/scripts/spec/spec_helper.coffee b/assets/scripts/spec/spec_helper.coffee
index 5e469126..88070108 100644
--- a/assets/scripts/spec/spec_helper.coffee
+++ b/assets/scripts/spec/spec_helper.coffee
@@ -6,6 +6,7 @@ minispade.require 'app'
   waits(50)
   runs ->
     Travis.reset()
+    Travis.auth.signOut()
     url = "/#{url}" unless url.match /^\//
     Travis.__container__.lookup('router:main').handleURL(url)