Added some NullPointerExceptions - Happy easter, you bastards! :D