Removed unnecessary catch clause.
Improved logging