diff --git a/lib/Doctrine/Connection/Pgsql.php b/lib/Doctrine/Connection/Pgsql.php
index 66f0f2d8b..29188b785 100644
--- a/lib/Doctrine/Connection/Pgsql.php
+++ b/lib/Doctrine/Connection/Pgsql.php
@@ -128,7 +128,12 @@ class Doctrine_Connection_Pgsql extends Doctrine_Connection_Common {
                        . $from . ' ' . $where . ' LIMIT ' . $limit . ')';
 
             } else {
-                $query .= ' LIMIT ' . $limit . ' OFFSET ' . $offset;
+                if($limit !== false) {
+                  $query .= ' LIMIT ' . $limit;
+                }
+                if($offset !== false) {
+                  $query .= ' OFFSET ' . $offset;
+                }
             }
         }
         return $query;
diff --git a/lib/Doctrine/Query.php b/lib/Doctrine/Query.php
index 33ed7e04d..816cef7a0 100644
--- a/lib/Doctrine/Query.php
+++ b/lib/Doctrine/Query.php
@@ -369,7 +369,7 @@ class Doctrine_Query extends Doctrine_Hydrate implements Countable {
             break;
             case 'limit':
             case 'offset':
-                if($args[0] === null)
+                if($args[0] == null)
                     $args[0] = false;
 
                 $this->parts[$name] = $args[0];