Add NPE checkFixes #1090 (commit: ee1a89f)
Fix Soaryn's broken stuff (commit: 66481d5)
More stuff for Soaryn (commit: defc41f)