diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
index 7c61620df..16b59fa64 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/costcategories/CostCategoryCRUDController.java
@@ -227,14 +227,16 @@ public class CostCategoryCRUDController extends GenericForwardComposer
             public void onEvent(Event event) throws Exception {
                 final Comboitem comboitem = autocomplete.getSelectedItem();
 
-                // Update hourCost
-                HourCost hourCost = (HourCost) row.getValue();
-                hourCost.setType((TypeOfWorkHours) comboitem.getValue());
-                row.setValue(hourCost);
+                if(comboitem != null) {
+                    // Update hourCost
+                    HourCost hourCost = (HourCost) row.getValue();
+                    hourCost.setType((TypeOfWorkHours) comboitem.getValue());
+                    row.setValue(hourCost);
 
-                // Update the hourPrice in the hourCost
-                hourCost.setPriceCost(((TypeOfWorkHours) comboitem.getValue()).getDefaultPrice());
-                Util.reloadBindings(listHourCosts);
+                    // Update the hourPrice in the hourCost
+                    hourCost.setPriceCost(((TypeOfWorkHours) comboitem.getValue()).getDefaultPrice());
+                    Util.reloadBindings(listHourCosts);
+                }
             }
         });
         row.appendChild(autocomplete);