bump versioncode and fix possible NPE

Change-Id: I7405593d8340633fe5948f4bc0b6aeee006829ad