Update version number
Catch a couple of NPEs