Removed an occuring npe.