few comments
null pointer exception fix