[Bug Fix] Following an upstream contract.

It's always a good idea to catch all potentially possible exceptions.