Exception handling is a little prettier.
Category index first working version.