diff --git a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
index c984130..5ad1b28 100644
--- a/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
+++ b/typo3/sysext/extbase/Classes/Property/TypeConverter/ObjectStorageConverter.php
@@ -57,8 +57,10 @@ class ObjectStorageConverter extends AbstractTypeConverter {
 	 */
 	public function convertFrom($source, $targetType, array $convertedChildProperties = array(), \TYPO3\CMS\Extbase\Property\PropertyMappingConfigurationInterface $configuration = NULL) {
 		$objectStorage = new \TYPO3\CMS\Extbase\Persistence\ObjectStorage();
-		foreach ($convertedChildProperties as $subProperty) {
-			$objectStorage->attach($subProperty);
+		if(is_array($source)){
+			foreach ($convertedChildProperties as $subProperty) {
+				$objectStorage->attach($subProperty);
+			}
 		}
 		return $objectStorage;
 	}