Minor additions | also  NullPointerException