Error logging improvements
Error logging improvements
Removed unused imports
Improved error reporting