Add cleaner logging for failures.