diff --git a/dibi/libs/DibiResult.php b/dibi/libs/DibiResult.php
index c65b6ca9..d35d3b07 100644
--- a/dibi/libs/DibiResult.php
+++ b/dibi/libs/DibiResult.php
@@ -638,7 +638,7 @@ class DibiResult extends DibiObject implements IDataSource
 
 			} elseif (class_exists('DateTime', FALSE)) { // since PHP 5.2
 				$value = new DateTime($value);
-				return $value ? $value->format($format) : NULL;
+				return $value->format($format);
 
 			} else {
 				return date($format, strtotime($value));
diff --git a/dibi/libs/DibiRow.php b/dibi/libs/DibiRow.php
index 20cf183b..6cb293cb 100644
--- a/dibi/libs/DibiRow.php
+++ b/dibi/libs/DibiRow.php
@@ -62,7 +62,7 @@ class DibiRow extends ArrayObject
 
 		} elseif (class_exists('DateTime', FALSE)) { // since PHP 5.2
 			$time = new DateTime($time);
-			return $time ? $time->format($format) : NULL;
+			return $time->format($format);
 
 		} else {
 			return date($format, strtotime($time));
diff --git a/dibi/libs/DibiTranslator.php b/dibi/libs/DibiTranslator.php
index 09115995..4c998ab2 100644
--- a/dibi/libs/DibiTranslator.php
+++ b/dibi/libs/DibiTranslator.php
@@ -417,26 +417,28 @@ final class DibiTranslator extends DibiObject
 
 
 		// without modifier procession
-		if (is_string($value))
+		if (is_string($value)) {
 			return $this->driver->escape($value, dibi::TEXT);
 
-		if (is_int($value) || is_float($value))
+		} elseif (is_int($value) || is_float($value)) {
 			return rtrim(rtrim(number_format($value, 5, '.', ''), '0'), '.');
 
-		if (is_bool($value))
+		} elseif (is_bool($value)) {
 			return $this->driver->escape($value, dibi::BOOL);
 
-		if ($value === NULL)
+		} elseif ($value === NULL) {
 			return 'NULL';
 
-		if ($value instanceof IDibiVariable)
+		} elseif ($value instanceof IDibiVariable) {
 			return $value->toSql($this, NULL);
 
-		if ($value instanceof DateTime)
+		} elseif ($value instanceof DateTime) {
 			return $this->driver->escape($value, dibi::DATETIME);
 
-		$this->hasError = TRUE;
-		return '**Unexpected ' . gettype($value) . '**';
+		} else {	
+			$this->hasError = TRUE;
+			return '**Unexpected ' . gettype($value) . '**';
+		}
 	}