no null

null pointer exception fixed