Update to catch execptions thown by modules.