diff --git a/services/src/main/java/de/hsadmin/service/pac/PacVO.java b/services/src/main/java/de/hsadmin/service/pac/PacVO.java
index d22e5b1..cf6d718 100644
--- a/services/src/main/java/de/hsadmin/service/pac/PacVO.java
+++ b/services/src/main/java/de/hsadmin/service/pac/PacVO.java
@@ -68,6 +68,7 @@ public class PacVO extends AbstractVO implements ValueObject {
 	
 	@ReadWrite(ReadWritePolicy.READWRITE)
 	@Display(sequence=70)
+	@Search(SearchPolicy.EQUALS)
 	private Boolean free;
 
 	@Required(true)
@@ -167,10 +168,13 @@ public class PacVO extends AbstractVO implements ValueObject {
 			if ("pacComponents".equals(p.getName())) {
 				if (persistentObject instanceof Pac) {
 					final Pac persistentPac = (Pac) persistentObject;
-					for (final PacComponentVO componentVO : getPacComponents()) {
-						final String feature = componentVO.getFeature();
-						final Integer quantity = componentVO.getQuantity();
-						persistentPac.getPacComponent(feature).setQuantity(quantity);
+					final List<PacComponentVO> pacComps = getPacComponents();
+					if (pacComps != null) {
+						for (final PacComponentVO componentVO : pacComps) {
+							final String feature = componentVO.getFeature();
+							final Integer quantity = componentVO.getQuantity();
+							persistentPac.getPacComponent(feature).setQuantity(quantity);
+						}
 					}
 				}
 			} else {