Clean up exception handling a little...