diff --git a/app/src/main/java/com/keepassdroid/activities/GroupActivity.java b/app/src/main/java/com/keepassdroid/activities/GroupActivity.java
index 8e40b0fac..5fe11d27d 100644
--- a/app/src/main/java/com/keepassdroid/activities/GroupActivity.java
+++ b/app/src/main/java/com/keepassdroid/activities/GroupActivity.java
@@ -189,12 +189,13 @@ public class GroupActivity extends ListNodesActivity
             currentGroup = db.pm.groups.get(pwGroupId);
         }
 
-        addGroupEnabled = !readOnly;
-        addEntryEnabled = !readOnly;
-
-        isRoot = (currentGroup == root);
-        if ( !currentGroup.allowAddEntryIfIsRoot() )
-            addEntryEnabled = !isRoot && addEntryEnabled;
+        if (currentGroup != null) {
+            addGroupEnabled = !readOnly;
+            addEntryEnabled = !readOnly; // TODO ReadOnly
+            isRoot = (currentGroup == root);
+            if (!currentGroup.allowAddEntryIfIsRoot())
+                addEntryEnabled = !isRoot && addEntryEnabled;
+        }
 
         return currentGroup;
     }
diff --git a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java b/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java
index 5bde6fb30..7396403aa 100644
--- a/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java
+++ b/app/src/main/java/com/keepassdroid/activities/ListNodesActivity.java
@@ -299,6 +299,7 @@ public abstract class ListNodesActivity extends LockingActivity
                     PwGroup recycleBin = database.getRecycleBin();
                     // Add trash if it doesn't exists
                     if (parent.equals(recycleBin)
+                            && mCurrentGroup != null
                             && mCurrentGroup.getParent() == null
                             && !mCurrentGroup.equals(recycleBin)) {
                         mAdapter.addNode(parent);