JBTM-1786:  adding missing catch logic