update error message to cover all instances