diff --git a/app/build.gradle b/app/build.gradle
index 11ea3c7..0fbe5a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "org.kore.kolabnotes.android"
         minSdkVersion 16
         targetSdkVersion 23
-        versionCode 49
-        versionName "1.5.0"
+        versionCode 50
+        versionName "1.5.1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/java/org/kore/kolabnotes/android/fragment/TagListFragment.java b/app/src/main/java/org/kore/kolabnotes/android/fragment/TagListFragment.java
index 74e19f8..2a6acb6 100644
--- a/app/src/main/java/org/kore/kolabnotes/android/fragment/TagListFragment.java
+++ b/app/src/main/java/org/kore/kolabnotes/android/fragment/TagListFragment.java
@@ -83,6 +83,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         toolbar = (Toolbar) getActivity().findViewById(R.id.toolbar_tag_list);
+
+        if(activity == null){
+            activity = (AppCompatActivity)getActivity();
+        }
+
         activity.setSupportActionBar(toolbar);
         if(activity.getSupportActionBar() != null) {
             activity.getSupportActionBar().setDisplayHomeAsUpEnabled(true);