[#51] Handling exceptions added