put error return hints back in.