aa5901b
Return better ewrror message that gives a hint about who actually returned it + Some cleanups (trainling spaces and such).