Cleaned up exception handling