diff --git a/src/Converter/Converter.php b/src/Converter/Converter.php
index 37350a82f..e6ff940e8 100644
--- a/src/Converter/Converter.php
+++ b/src/Converter/Converter.php
@@ -163,7 +163,7 @@ public static function toLdapBoolean($value)
         if (!is_scalar($value)) {
             return $return;
         }
-        if (true === $value || 'true' === strtolower($value) || 1 === $value) {
+        if (true === $value || (is_string($value) && 'true' === strtolower($value)) || 1 === $value) {
             $return = 'TRUE';
         }
         return $return;
@@ -321,7 +321,9 @@ public static function fromLdapDateTime($date, $asUtc = true)
                 if (isset($off[3])) {
                     $offsetMinutes = substr($off[3], 0, 2);
                     if ($offsetMinutes < 0 || $offsetMinutes > 59) {
-                        throw new Exception\InvalidArgumentException('Invalid date format found (invalid offset minute)');
+                        throw new Exception\InvalidArgumentException(
+                            'Invalid date format found (invalid offset minute)'
+                        );
                     }
                     $time['offsetminutes'] = $offsetMinutes;
                 }