+ Changed error output to be included in the exception