Commenting out failing, but also buggy code.
Don't rethrow what isn't thrown.