Fix appengine version number
Fix NPE