Slightly improve error reporting for domain deletion

Change-Id: Ibf33851e72291298ad4c90ae4bd0dbafc860b03a
Merge "Slightly improve error reporting for domain deletion"