Added more defensive changes
Merge branch 'master' of https://github.com/BadBoy-Ultimate-Raider/BadBoy