Add better errors to dump