Removed redundant try-catch and improved log-message