Exception handling improvements
Optimized imports