diff --git a/include/simpleplugin/class_attribute.inc b/include/simpleplugin/class_attribute.inc
index 0ca9001ca6bcad218c08068b74a7329928d0e727..0f43741f95971fe61aaf2d006c862a1d6bfc3e17 100644
--- a/include/simpleplugin/class_attribute.inc
+++ b/include/simpleplugin/class_attribute.inc
@@ -1490,7 +1490,6 @@ class DateAttribute extends Attribute
     } elseif (!($this->value instanceof DateTime)) {
       try {
         $this->setValue($this->getDateValue());
-        return $this->dateToLdap($this->value);
       } catch (Exception $e) {
         if (is_object($this->plugin) && $this->plugin->is_template) {
           return $value;
@@ -1499,6 +1498,7 @@ class DateAttribute extends Attribute
         }
       }
     }
+    return $this->dateToLdap($this->value);
   }
 
   function check ()