Removed nullpointer