diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
index 4595cd7664b756e6bb08af27cea70eb10c0ec1fd..5af0e5171ec6feb98044db2e19941cf1c93101e9 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/ui/MainActivity.kt
@@ -104,12 +104,14 @@ class MainActivity : ServiceBoundActivity() {
     }
 
     state.observe(this, Observer {
-      val disconnected = it == ConnectionState.DISCONNECTED
+      val status = it ?: ConnectionState.DISCONNECTED
+      val disconnected = status == ConnectionState.DISCONNECTED
+
       disconnect.isEnabled = !disconnected
       connect.isEnabled = disconnected
 
       snackbar?.dismiss()
-      snackbar = Snackbar.make(errorList, it!!.name, Snackbar.LENGTH_SHORT)
+      snackbar = Snackbar.make(errorList, status.name, Snackbar.LENGTH_SHORT)
       snackbar?.show()
     })
   }