Will changing this to throw an exception break anything?  From what I remember, the error handler Rouven built in should handle exceptions, but I just want to make sure before merging this.