Fixed rare interruptedException-style crap & null pointer stuff