Commentary/Errors: Fixes to error messages to state where the errors have occurred.