Added catch clause support
Fixed up broken test case