Fix: CommandSender may be null at this point
Dev: Small code cleanup
Format: Better CommandSender detection
Fix: broadcast message might end up being null