Revert "check if entity is in any group before checking if it is in specific group (was NullPointerException)"

This reverts commit 62a0ac4119400fa6494f08d5689f5f2103ac895b.
check if entity is in any group before checking if it is in specific group (was NullPointerException)