Changed handling of module not in list