Return for showing notifications if context is null
Fix merge conflict