change to error handling gold may