I know, which is why I added the `TODO` above. I just wasn't sure what a good alternative would be. Removing that is as simple as replacing that `InternalError` message with a generic one (or something more specific for certain types of errors, if need be).