diff --git a/plugins/cck_field/upload_file/upload_file.php b/plugins/cck_field/upload_file/upload_file.php
index e91a2e0a5..3d33d5224 100644
--- a/plugins/cck_field/upload_file/upload_file.php
+++ b/plugins/cck_field/upload_file/upload_file.php
@@ -45,7 +45,8 @@ public function onCCK_FieldDelete( &$field, $value = '', &$config = array() )
 			return;
 		}
 
-		if ( $value == '' ) {
+		$value_json			=	JCckDev::fromJSON( $value );
+		if ( $value == '' || isset( $value_json['file_location'] ) && $value_json['file_location'] == '' ) {
 			return;
 		}
 		
diff --git a/plugins/cck_field/upload_image/upload_image.php b/plugins/cck_field/upload_image/upload_image.php
index 7783f99a8..fc88247e2 100644
--- a/plugins/cck_field/upload_image/upload_image.php
+++ b/plugins/cck_field/upload_image/upload_image.php
@@ -45,7 +45,8 @@ public function onCCK_FieldDelete( &$field, $value = '', &$config = array() )
 			return;
 		}
 
-		if ( $value == '' ) {
+		$value_json		=	JCckDev::fromJSON( $value );
+		if ( $value == '' || isset( $value_json['image_location'] ) && $value_json['image_location'] == '' ) {
 			return;
 		}