Error logging improvements
Error logging improvements
Removed unused imports
Improved error reporting
Merge remote-tracking branch 'origin/master' into migration