#55 fixed null pointer exception