diff --git a/core/modules/rdf/rdf.install b/core/modules/rdf/rdf.install
index feda96a..64c3a52 100644
--- a/core/modules/rdf/rdf.install
+++ b/core/modules/rdf/rdf.install
@@ -47,9 +47,9 @@ function rdf_update_8000() {
           }
           $field_mappings[$key]['mapping_type'] = $value['type'];
         }
-        $field_mappings[$key]['properties'] = !empty($value['predicates']) ? $value['predicates'] : NULL;
-        $field_mappings[$key]['datatype'] = !empty($value['datatype']) ? $value['datatype'] : NULL;
-        $field_mappings[$key]['datatype_callback'] = !empty($value['callback']) ? $value['callback'] : NULL;
+        !empty($value['predicates']) ? $field_mappings[$key]['properties'] = $value['predicates'] : NULL;
+        !empty($value['datatype']) ? $field_mappings[$key]['datatype'] = $value['datatype'] : NULL;
+        !empty($value['callback']) ? $field_mappings[$key]['datatype_callback'] = $value['callback'] : NULL;
       }
     }
     $config->set('fieldMappings', $field_mappings);
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 8d3ec02..890bcd6 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -174,7 +174,7 @@ function rdf_rdfa_attributes($mapping, $data = NULL) {
       if (!empty($mapping['properties'])) {
         $attributes['property'] = $mapping['properties'];
         // Convert $data to a specific format as per the callback function.
-        if (isset($data) && isset($mapping['datatype_callback'])) {
+        if (isset($data) && !empty($mapping['datatype_callback'])) {
           $callback = $mapping['datatype_callback'];
           $attributes['content'] = $callback($data);
         }