LGS-1108 exception swallowing

Hi Jorge,

here's my proposed fix for LGS-1108.

Thanks,

Josef