Make the manifest rebuild code more robust

Try to make sure we've actually found msgpack data before feeding
it into msgpack.