Added a catch for an exception I need to handle...

... in a more appropriate fashion.