Fix incorrectly throwing errors