Improved exception handling in the worker
Fixed issue wit loading credentials
Merge fun