diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
index 61ae7f496..41894b221 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/settings/SettingsModel.java
@@ -105,7 +105,9 @@ public class SettingsModel implements ISettingsModel {
         for (Label label : allLabels) {
             label.getType().getName();
         }
-        Collections.sort(allLabels);
+        if ((allLabels != null) && (!allLabels.isEmpty())) {
+            Collections.sort(allLabels);
+        }
     }
 
     @Transactional(readOnly = true)
@@ -115,7 +117,9 @@ public class SettingsModel implements ISettingsModel {
         for (Criterion criterion : allCriteria) {
             criterion.getType().getName();
         }
-        Collections.sort(allCriteria);
+        if ((allCriteria != null) && (!allCriteria.isEmpty())) {
+            Collections.sort(allCriteria);
+        }
     }
 
     @Transactional(readOnly = true)