less ugly when version cannot be parsed

Change-Id: Ib8daa4e3b88c4b93bdb3c13cdd37b3d922d00eae
refactored zero

Change-Id: I0978a74282e2e9752ab6c7795a97c8aa29217907