Change to error handling gold may