Minor changes to error data returned to user.