Merge "Added some error logs to wipe"