[FIX] Gateways: Add error handling messages (RT-2654)