diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
index bfce8b4ff..081c17ccb 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormCRUDController.java
@@ -382,7 +382,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
                     throws WrongValueException {
                 getQualityForm().setName((String) value);
                 if(((String)value == null) || (((String)value)).isEmpty()){
-                    throw new WrongValueException(comp, _("cannot be null or empty"));
+                    throw new WrongValueException(comp, _("cannot be empty"));
                 } else if (!qualityFormModel
                         .checkConstraintUniqueQualityFormName()) {
                     getQualityForm().setName(null);
@@ -404,7 +404,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
                 if (((String) value == null) || (((String) value)).isEmpty()) {
                     item.setName(null);
                     throw new WrongValueException(comp,
-                            _("cannot be null or empty"));
+ _("cannot be empty"));
                 } else if (!qualityFormModel
                         .checkConstraintUniqueQualityFormItemName()) {
                     item.setName(null);
@@ -428,7 +428,7 @@ public class QualityFormCRUDController extends GenericForwardComposer {
 
                 if (newPercentage == null) {
                     item.setPercentage(null);
-                    throw new WrongValueException(comp, _("cannot be null"));
+                    throw new WrongValueException(comp, _("cannot be empty"));
                 }
                 if (qualityFormModel
                         .checkConstraintOutOfRangeQualityFormItemPercentage(item)) {
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
index 39e745f0b..3bc7b398d 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/qualityforms/QualityFormModel.java
@@ -47,6 +47,8 @@ public class QualityFormModel implements IQualityFormModel {
 
     private QualityForm qualityForm;
 
+    private List<QualityForm> listQualityForms = new ArrayList<QualityForm>();
+
     public QualityFormModel() {
 
     }
@@ -54,23 +56,23 @@ public class QualityFormModel implements IQualityFormModel {
     @Override
     @Transactional(readOnly=true)
     public List<QualityForm> getQualityForms(String predicate) {
-        List<QualityForm> listAll = qualityFormDAO.getAll();
-        if ((predicate != null) && (!predicate.isEmpty())) {
-            return filterQualityForms(listAll,predicate);
-        }
-        return listAll;
+        listQualityForms.clear();
+        listQualityForms = qualityFormDAO.getAll();
+        return listQualityForms;
     }
 
-    private List<QualityForm> filterQualityForms(List<QualityForm> listAll,
-            String predicate) {
-        List<QualityForm> result = new ArrayList<QualityForm>();
-        for (QualityForm qualityForm : listAll) {
-            if (qualityForm.getName().toLowerCase().contains(
-                    predicate.toLowerCase())) {
-                result.add(qualityForm);
+    public List<QualityForm> filterQualityForms(String predicate) {
+        if ((predicate != null) && (!predicate.isEmpty())) {
+            List<QualityForm> result = new ArrayList<QualityForm>();
+            for (QualityForm qualityForm : listQualityForms) {
+                if (qualityForm.getName().toLowerCase().contains(
+                        predicate.toLowerCase())) {
+                    result.add(qualityForm);
+                }
             }
+            return result;
         }
-        return result;
+        return listQualityForms;
     }
 
     @Override