Add error checking for zip presence

Change-Id: Ia9f14fe42aea391507b4408270a7541f453b24e1