diff --git a/src/main/java/org/olat/commons/calendar/ICalServlet.java b/src/main/java/org/olat/commons/calendar/ICalServlet.java
index beeed74b2a10369731ca15cbdc0b4281a36223ab..abe0dfae00c8b88f44703e1e10076d4dfbd0c5a1 100644
--- a/src/main/java/org/olat/commons/calendar/ICalServlet.java
+++ b/src/main/java/org/olat/commons/calendar/ICalServlet.java
@@ -437,8 +437,10 @@ public class ICalServlet extends HttpServlet {
 			if (comp instanceof VEvent) {
 				VEvent event = (VEvent)comp;
 				Uid uid = event.getUid();
-				String newUid = prefix.concat(uid.getValue());
-				uid.setValue(newUid);
+				if(uid != null) {
+					String newUid = prefix.concat(uid.getValue());
+					uid.setValue(newUid);
+				}
 			}
 		}
 	}