diff --git a/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java b/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
index 2825e7950a46dd146abc86fad5b9bf022f4b9f40..4012847b407e31a7508289500a836915d25276e1 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/BigBlueButtonModule.java
@@ -103,11 +103,15 @@ public class BigBlueButtonModule extends AbstractSpringModule implements ConfigO
 		contextPath = getStringPropertyValue(PROP_CONTEXTPATH, contextPath);
 		secret = getStringPropertyValue(PROP_SECRET, secret);
 		sharedSecret = getStringPropertyValue(PROP_SHARED_SECRET, sharedSecret);
+		adhocMeetingEnabled = getStringPropertyValue(PROP_ADHOC_MEETING, adhocMeetingEnabled);
+		permanentMeetingEnabled = getStringPropertyValue(PROP_PERMANENT_MEETING, permanentMeetingEnabled);
 		
 		String bandwidthReqObj = getStringPropertyValue(PROP_USER_BANDWIDTH_REQUIREMENT, true);
 		if(StringHelper.containsNonWhitespace(bandwidthReqObj)) {
 			userBandwidhtRequirement = Double.parseDouble(bandwidthReqObj);
 		}
+		
+		
 	}
 	
 	@Override
diff --git a/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java b/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
index d47862050cdad4f7bd17b50a692dceb730638d54..4522835379024f86fe3a6e49ac94f10864a7274a 100644
--- a/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
+++ b/src/main/java/org/olat/modules/bigbluebutton/ui/EditBigBlueButtonMeetingController.java
@@ -175,7 +175,7 @@ public class EditBigBlueButtonMeetingController extends FormBasicController {
 		leadTimeEl = uifactory.addTextElement("meeting.leadTime", 8, leadtime, formLayout);
 		
 		Date endDate = meeting == null ? null : meeting.getEndDate();
-		if (endDate == null) {
+		if (endDate == null && startDate != null) {
 			// set meeting time default to 1 hour
 			Calendar calendar = Calendar.getInstance();
 		    calendar.setTime(startDate);
diff --git a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
index a7a473804040172ae0890b59c2d624281c36c98f..001405df0bd4e28163f87459771e59b705fb17ab 100644
--- a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
+++ b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
@@ -401,6 +401,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
 
 	@Override
 	public boolean deleteCurriculumElement(CurriculumElementRef element) {
+		if(element == null) return true; // nothing to do
+		
 		List<CurriculumElement> children = curriculumElementDao.getChildren(element);
 		for(CurriculumElement child:children) {
 			deleteCurriculumElement(child);