Another NullPointer, added creative check