diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
index 2eb97e7e8..5e62a9ed4 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/common/ConfigurationController.java
@@ -242,7 +242,8 @@ public class ConfigurationController extends GenericForwardComposer {
 
     public void save() throws InterruptedException {
 
-        if ( getSelectedConnector().getName().equals("E-mail") && isEmailFieldsValid() == false) {
+        if ( getSelectedConnector() != null && getSelectedConnector().getName().equals("E-mail") &&
+                isEmailFieldsValid() == false ) {
             messages.showMessage(Level.ERROR, _("Check username/password/sender fields"));
         } else {
                 ConstraintChecker.isValid(configurationWindow);