Adding catch method

Closing #18