Stabilize: Fix possible NPE
Fix some scary bugs found with FindBugs