diff --git a/CHANGELOG b/CHANGELOG
index 7fc9c744..24eae296 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,7 @@ Changes to version 1.2.2
 - TLS client: fixed problem with high CPU load
 - ISO connection: fixed race condition that can cause corrupted messages
 - .NET API: added project files for .NET core 2.0
+- .NET API: added server side support for TLS
 
 Changes to version 1.2.1
 ------------------------
diff --git a/tools/model_generator/src/com/libiec61850/scl/SclParser.java b/tools/model_generator/src/com/libiec61850/scl/SclParser.java
index 4ed22e51..fc73748d 100644
--- a/tools/model_generator/src/com/libiec61850/scl/SclParser.java
+++ b/tools/model_generator/src/com/libiec61850/scl/SclParser.java
@@ -27,6 +27,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.Collection;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Stack;
@@ -57,8 +58,8 @@ import com.libiec61850.scl.types.EnumerationType;
 import com.libiec61850.scl.types.LogicalNodeType;
 import com.libiec61850.scl.types.TypeDeclarations;
 
-public class SclParser {
-
+public class SclParser 
+{
     private List<IED> ieds;
     private Communication communication;
     private TypeDeclarations typeDeclarations;
@@ -111,6 +112,11 @@ public class SclParser {
         return null;
     }
     
+    public Collection<IED> getIeds()
+    {
+        return ieds;
+    }
+    
     public IED getFirstIed() {
     	return ieds.get(0);
     }
@@ -314,4 +320,4 @@ public class SclParser {
         return null;
     }
 
-}
\ No newline at end of file
+}
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..f506caa6 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/AccessPoint.java
@@ -43,9 +43,9 @@ 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);
+			this.server = null;
+		else
+		    this.server = new Server(serverNode, typeDeclarations);
 		
 	}
 
diff --git a/tools/model_generator/src/com/libiec61850/scl/model/IED.java b/tools/model_generator/src/com/libiec61850/scl/model/IED.java
index fb381aeb..45936a04 100644
--- a/tools/model_generator/src/com/libiec61850/scl/model/IED.java
+++ b/tools/model_generator/src/com/libiec61850/scl/model/IED.java
@@ -41,9 +41,6 @@ public class IED {
 		
 		List<Node> accessPointNodes = ParserUtils.getChildNodesWithTag(iedNode, "AccessPoint");
 
-		if (accessPointNodes.size() == 0)
-			throw new SclParserException(iedNode, "no AccessPoint defined in IED " + name);
-
 		this.accessPoints = new LinkedList<AccessPoint>();
 		
 		for (Node accessPointNode : accessPointNodes) {