More changes. Null pointer exception present in code