diff --git a/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java b/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
index 91fec813..3abef9bb 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
@@ -42,10 +42,8 @@ public class AccessPoint {
 
 		Node serverNode = ParserUtils.getChildNodeWithTag(apNode, "Server");
 		
-		if (serverNode == null)
-			throw new SclParserException(apNode, "AccessPoint has no server defined!");
-			
-		this.server = new Server(serverNode, typeDeclarations);
+		if (serverNode != null)
+	                this.server = new Server(serverNode, typeDeclarations);
 		
 	}