Revert "Add null checks for permissions and messaging"

This reverts commit ba88bc50b567a619a245baac07cadef42a9d4bdd.