diff --git a/src/GDS/Gateway/ProtoBuf.php b/src/GDS/Gateway/ProtoBuf.php
index 39d86a8..3372519 100644
--- a/src/GDS/Gateway/ProtoBuf.php
+++ b/src/GDS/Gateway/ProtoBuf.php
@@ -67,7 +67,9 @@ public function __construct($str_dataset = null, $str_namespace = null)
         if(null === $str_dataset) {
             if(isset($_SERVER['APPLICATION_ID'])) {
                 $this->str_dataset_id = $_SERVER['APPLICATION_ID'];
-            } else {
+            } elseif (isset($_SERVER['GAE_APPLICATION'])) {
+                $this->str_dataset_id = $_SERVER['GAE_APPLICATION'];
+            }  else {
                 throw new \Exception('Could not determine DATASET, please pass to ' . get_class($this) . '::__construct()');
             }
         } else {