diff --git a/src/InfluxDB/Point.php b/src/InfluxDB/Point.php
index 11bd16e..054cbc7 100644
--- a/src/InfluxDB/Point.php
+++ b/src/InfluxDB/Point.php
@@ -52,8 +52,14 @@ public function __construct(
         if (empty($measurement)) {
             throw new DatabaseException('Invalid measurement name provided');
         }
+        
+        if ($timestamp && !$this->isValidTimeStamp($timestamp)) {
+            throw new DatabaseException(sprintf('%s is not a valid timestamp', $timestamp));
+        }
 
         $this->measurement = (string) $measurement;
+        $this->timestamp = $timestamp;
+        
         $this->setTags($tags);
         $fields = $additionalFields;
 
@@ -62,12 +68,6 @@ public function __construct(
         }
 
         $this->setFields($fields);
-
-        if ($timestamp && !$this->isValidTimeStamp($timestamp)) {
-            throw new DatabaseException(sprintf('%s is not a valid timestamp', $timestamp));
-        }
-
-        $this->timestamp = $timestamp;
     }
 
     /**