Corrected exception handling
Added new tool