diff --git a/module/file/model.php b/module/file/model.php
index 78a93bf5e8..3a0a2b7a78 100755
--- a/module/file/model.php
+++ b/module/file/model.php
@@ -1082,7 +1082,7 @@ class fileModel extends model
         if($type == 'file' and stripos($content, $this->savePath) !== 0) helper::end();
 
         /* Append the extension name auto. */
-        $extension = '.' . $fileType;
+        $extension = $fileType ? '.' . $fileType : '';
         if(strpos($fileName, $extension) === false) $fileName .= $extension;
 
         /* urlencode the filename for ie. */
diff --git a/module/instance/control.php b/module/instance/control.php
index d227dddbd4..723e85550a 100644
--- a/module/instance/control.php
+++ b/module/instance/control.php
@@ -137,8 +137,7 @@ class instance extends control
         {
             $url      = strstr(getWebRoot(true), ':', true) . '://' . $instance->domain;
             $pipeline = $this->loadModel('pipeline')->getByUrl($url);
-            $instance->externalID = $pipeline->id;
-            
+            $instance->externalID = !empty($pipeline) ? $pipeline->id : 0;
         }
 
         $this->view->title           = $instance->appName;
diff --git a/module/instance/zen.php b/module/instance/zen.php
index 688c677002..ee020d16de 100644
--- a/module/instance/zen.php
+++ b/module/instance/zen.php
@@ -41,7 +41,7 @@ class instanceZen extends instance
         $pipeline->token       = zget($tempMappings, 'api_token', '');
         $pipeline->account     = zget($tempMappings, 'z_username', '');
         $pipeline->password    = zget($tempMappings, 'z_password', '');
-        if($instance->appID === 60) $pipeline->token = base64_encode($pipeline->token . ':');
+        if($instance->appID == 60) $pipeline->token = base64_encode($pipeline->token . ':');
         if(empty($pipeline->account)) $pipeline->account = zget($tempMappings, 'admin_username', '');
 
         $this->pipeline->create($pipeline);