diff --git a/.gitignore b/.gitignore
index e7ba6aa0d2d4257e51d21c4f148c3c9d38efe4d2..f7e5b61f265dd8253f1856b66e771d694dc98ac4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,5 +8,5 @@ local.properties
 .idea/*
 gradle*
 gradle.properties
-QuasselDroid/version.properties
+*/version.properties
 deploy.sh
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index bdd14097685e88a6f9a7dc5bd0376ff91167a1b2..0417563f736853791378def5f6c7884887281228 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
 
         <activity
             android:name=".MainActivity"
-            android:label="@string/title_activity_main"
+            android:label="@string/app_name"
             android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java b/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
index 77b0613c33e8dcfcc84fcf4bed7e7dd23c42dd06..8037ceb43735316a9d44d7b1dcb24ee8b2a4b7d4 100644
--- a/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
+++ b/app/src/main/java/de/kuschku/quasseldroid_ng/MainActivity.java
@@ -243,8 +243,14 @@ public class MainActivity extends AppCompatActivity {
     private void switchBuffer(int bufferId) {
         this.bufferId = bufferId;
 
+        Buffer buffer = handler.getClient().getBuffer(this.bufferId);
         adapter.setMessageList(handler.getClient().getBacklogManager().get(this.bufferId));
-        toolbar.setTitle(handler.getClient().getBuffer(this.bufferId).getName());
+        if (buffer == null) {
+            toolbar.setTitle(R.string.app_name);
+        } else {
+            toolbar.setTitle(buffer.getName());
+        }
+
         drawer.setSelection(this.bufferId, false);
         drawer.closeDrawer();
     }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f060e4c12ee52e6ef9e2aa0da59cd37a11b66274..d999eaf8105035aec8959b7635b32a2d96477fb4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,7 +1,5 @@
 <resources>
-    <string name="app_name">QuasselDroid-ng</string>
-    <string name="title_activity_main">MainActivity</string>
-    <string name="title_activity_main2">Main2Activity</string>
+    <string name="app_name">QuasselDroid</string>
     <string name="action_settings">Settings</string>
     <string name="default_port">4242</string>
 </resources>