diff --git a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
index 884884071ac..ac26a44fdd6 100644
--- a/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
+++ b/provisioning/provisioning-impl/src/main/java/com/evolveum/midpoint/provisioning/ucf/impl/IcfConvertor.java
@@ -162,12 +162,18 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 			if (icfAttr.getName().equals(OperationalAttributes.PASSWORD_NAME)) {
 				// password has to go to the credentials section
 				ProtectedStringType password = getSingleValue(icfAttr, ProtectedStringType.class);
+				if (password == null) {
+					continue;
+				}
 				ShadowUtil.setPassword(shadow, password);
 				LOGGER.trace("Converted password: {}", password);
 				continue;
 			}
 			if (icfAttr.getName().equals(OperationalAttributes.ENABLE_NAME)) {
 				Boolean enabled = getSingleValue(icfAttr, Boolean.class);
+				if (enabled == null) {
+					continue;
+				}
 				ActivationType activationType = ShadowUtil.getOrCreateActivation(shadow);
 				ActivationStatusType activationStatusType;
 				if (enabled) {
@@ -183,6 +189,9 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 			
 			if (icfAttr.getName().equals(OperationalAttributes.ENABLE_DATE_NAME)) {
 				Long millis = getSingleValue(icfAttr, Long.class);
+				if (millis == null) {
+					continue;
+				}
 				ActivationType activationType = ShadowUtil.getOrCreateActivation(shadow);
 				activationType.setValidFrom(XmlTypeConverter.createXMLGregorianCalendar(millis));
 				continue;
@@ -190,6 +199,9 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 
 			if (icfAttr.getName().equals(OperationalAttributes.DISABLE_DATE_NAME)) {
 				Long millis = getSingleValue(icfAttr, Long.class);
+				if (millis == null) {
+					continue;
+				}
 				ActivationType activationType = ShadowUtil.getOrCreateActivation(shadow);
 				activationType.setValidTo(XmlTypeConverter.createXMLGregorianCalendar(millis));
 				continue;
@@ -197,6 +209,9 @@ <T extends ShadowType> PrismObject<T> convertToResourceObject(ConnectorObject co
 			
 			if (icfAttr.getName().equals(OperationalAttributes.LOCK_OUT_NAME)) {
 				Boolean lockOut = getSingleValue(icfAttr, Boolean.class);
+				if (lockOut == null) {
+					continue;
+				}
 				if (lockOut != null){
 					ActivationType activationType = ShadowUtil.getOrCreateActivation(shadow);
 					LockoutStatusType lockoutStatusType;