diff --git a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
index 8021fb1da25c86c83769130b233f61926d8f4f4c..f4cc88502415e2c6b7a4289e0ea06186bbce7bfe 100644
--- a/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
+++ b/ozgcloud-keycloak-operator/src/main/java/de/ozgcloud/operator/keycloak/realm/KeycloakRealmMapper.java
@@ -54,24 +54,28 @@ interface KeycloakRealmMapper {
 	
 	@Named("smtpServer")
 	 default Map<String, String> mapSmtpServer(OzgCloudKeycloakRealmSpec.KeycloakRealmSMTPServer server) {
+		
 		Map<String, String> smtpServer = new HashMap<>();
-		if( server.getHost() != null )
-			smtpServer.put("host", server.getHost());
-		if( server.getPort() != null )
-			smtpServer.put("port", server.getPort());
-		if( server.getUser() != null )
-			smtpServer.put("user", server.getUser());
-		if( server.getPassword() != null )
-			smtpServer.put("password", server.getPassword());
-		if( server.getStarttls() != null )
-			smtpServer.put("starttls", server.getStarttls()); 
-		if( server.getAuth() != null )
-			smtpServer.put("auth", server.getAuth()); 
-		if( server.getFrom() != null )
-			smtpServer.put("from", server.getFrom()); 
-		if( server.getFromDisplayName() != null ) 
-			smtpServer.put("fromDisplayName", server.getFromDisplayName()); 
+		if( server != null ) {
+			if( server.getHost() != null )
+				smtpServer.put("host", server.getHost());
+			if( server.getPort() != null )
+				smtpServer.put("port", server.getPort());
+			if( server.getUser() != null )
+				smtpServer.put("user", server.getUser());
+			if( server.getPassword() != null )
+				smtpServer.put("password", server.getPassword());
+			if( server.getStarttls() != null )
+				smtpServer.put("starttls", server.getStarttls()); 
+			if( server.getAuth() != null )
+				smtpServer.put("auth", server.getAuth()); 
+			if( server.getFrom() != null )
+				smtpServer.put("from", server.getFrom()); 
+			if( server.getFromDisplayName() != null ) 
+				smtpServer.put("fromDisplayName", server.getFromDisplayName()); 
+		}
 		return smtpServer;
+		
 	}
 
 }