CF-197 Updated catch for MCOL & PCOL messages