Updates to the error handling to include parameters