Forgot to add to last commit.

Actually has the catch and re-throw.