Made a few modifications to catch404 to clean it up a bit.