Added a proper error step and error messages.