You mean a replacing the Exception with a simple return, like in the new commit?