Extra null pointer exception eliminated
Versioning updated