Prevent fatals in dumps

Change-Id: Id6e7119b864f433ecdbf950b98a78bc78c5dc593