diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 3527bcdd..d9cb489e 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -580,9 +580,14 @@ NSString *const MPDocumentGroupKey                        = @"MPDocumentGroupKey
   switch([MPActionHelper typeForAction:[anItem action]]) {
     case MPActionAddGroup:
       valid &= (nil != self.selectedGroup);
-      // fall-through
+      valid &= (self.trash != self.selectedGroup);
+      valid &= ![self isItemTrashed:self.selectedGroup];
+      break;
     case MPActionAddEntry:
-      // fall-through
+      valid &= (nil != self.selectedGroup);
+      valid &= (self.trash != self.selectedGroup);
+      valid &= ![self isItemTrashed:self.selectedGroup];
+      break;
     case MPActionDelete:
       valid &= (nil != self.selectedItem);
       valid &= (self.trash != self.selectedItem);
diff --git a/README.md b/README.md
index 983e72b6..dc7e8bdb 100644
--- a/README.md
+++ b/README.md
@@ -61,7 +61,9 @@ It is able to read and write database version 1 and 2. Not all database features
 
 ## Help
 
-You might get help in the IRC channel [#macpass](irc://irc.freenode.org/macpass) on [irc.freenode.org](irc://irc.freenode.org)
+Some questions might be ansered in the [FAQ](https://github.com/mstarke/MacPass/wiki/FAQ)
+
+Another place to look is the IRC channel [#macpass](irc://irc.freenode.org/macpass) on [irc.freenode.org](irc://irc.freenode.org)
 
 ##License
 
diff --git a/TransformerKit b/TransformerKit
index a1f3d663..c3ccd5fe 160000
--- a/TransformerKit
+++ b/TransformerKit
@@ -1 +1 @@
-Subproject commit a1f3d663240d879f5341e1a97cee8413477a4e44
+Subproject commit c3ccd5fed4d77ac689dcf1b20f79db76935d2069