Another NPE fix... crap