Added some catching to avoid [generic Exception]