diff --git a/src/main/java/org/olat/course/site/CourseSiteDef.java b/src/main/java/org/olat/course/site/CourseSiteDef.java
index 3deaf2a79ad3e555c84f1c8fb5fbc32e51993e33..4487d7e0ed329c5a9581af0bede6f51a9754a35e 100644
--- a/src/main/java/org/olat/course/site/CourseSiteDef.java
+++ b/src/main/java/org/olat/course/site/CourseSiteDef.java
@@ -94,14 +94,18 @@ public class CourseSiteDef extends AbstractSiteDefinition implements SiteDefinit
 		}
 		
 		LanguageConfiguration langConfig = getLanguageConfiguration(ureq, courseConfig);
+		if(langConfig == null) {
+			return null;
+		}
 		String icon = courseConfig.getNavIconCssClass();
 		return new CourseSite(this, ureq.getLocale(), langConfig.getRepoSoftKey(), showToolController,
 				siteSecCallback, langConfig.getTitle(), icon);
 	}
 	
 	protected LanguageConfiguration getLanguageConfiguration(UserRequest ureq, CourseSiteConfiguration config) {
+		if(config == null || config.getConfigurations() == null) return null;
 		String language = ureq.getUserSession().getLocale().getLanguage();
-
+		
 		LanguageConfiguration myLangConfig = null;
 		LanguageConfiguration defaultLangConfig = null;
 		for(LanguageConfiguration langConfig:config.getConfigurations()) {