Fixed some issues identified by FindBugs (dead stores, redundant null checks, etc)
Merged 2 if-statements
Merge pull request #338 from iloveportalz0r/stuff

Fix some issues identified by FindBugs