Improved ModuleDataSource Error Handling and ModuleId/ModuleID casing tolerance