Expand Catch Clause to cover all possible cases