diff --git a/share/pnp/application/controllers/special.php b/share/pnp/application/controllers/special.php
index 98d86cf5..b25de0c6 100644
--- a/share/pnp/application/controllers/special.php
+++ b/share/pnp/application/controllers/special.php
@@ -6,7 +6,16 @@
  * @author     Joerg Linge
  * @license    GPL
  */
-class Special_Controller extends System_Controller  {
+ 
+class Special_Controller extends System_Controller {
+
+    // Explicitly declare the dynamic properties
+    public $templates;
+    public $url;
+    public $template;
+    public $tpl;
+    public $data;
+    public $view;
 
     public function __construct()
     {
@@ -15,15 +24,16 @@ public function __construct()
         $this->template->graph = $this->add_view('graph');
         $this->templates       = $this->data->getSpecialTemplates();
         $this->data->GRAPH_TYPE = 'special';
-        if($this->tpl == ''){
-            if($this->templates)
+        if ($this->tpl == '') {
+            if ($this->templates)
                 $this->tpl = $this->templates[0];
-                url::redirect('special?tpl='.$this->tpl, 302);
+                url::redirect('special?tpl=' . $this->tpl, 302);
         }
     }
 
-    public function index(){
-	$this->url = "?tpl=".$this->tpl;
+    public function index()
+    {
+        $this->url = "?tpl=" . $this->tpl;
         $this->template->zoom_header   = $this->add_view('zoom_header');
         $this->template->zoom_header->graph_width  = ($this->config->conf['zgraph_width'] + 140);
         $this->template->zoom_header->graph_height = ($this->config->conf['zgraph_height'] + 230);
@@ -38,7 +48,7 @@ public function index(){
         $this->template->graph->widget_menu   = $this->add_view('widget_menu');
         $this->template->graph->graph_content->widget_graph  = $this->add_view('widget_graph');
         #print Kohana::debug($services);
-        $this->data->buildDataStruct('__special',$this->tpl,$this->view);
+        $this->data->buildDataStruct('__special', $this->tpl, $this->view);
         $this->template->graph->icon_box      = $this->add_view('icon_box');
         $this->template->graph->icon_box->position = "special";
         $this->template->graph->logo_box      = $this->add_view('logo_box');
@@ -48,5 +58,4 @@ public function index(){
         $this->template->graph->header->title        = $this->data->MACRO['TITLE'];
         //print Kohana::debug($this->data);
     }
-
 }
diff --git a/share/pnp/application/helpers/pnp.php b/share/pnp/application/helpers/pnp.php
index de6a7f11..7df9a920 100644
--- a/share/pnp/application/helpers/pnp.php
+++ b/share/pnp/application/helpers/pnp.php
@@ -100,7 +100,7 @@ public static function addToUri($fields = array(),$base = True){
 	    if($value === ''){
 		continue;
 	    }
-	    $uri .= $key."=".urlencode($value)."&";
+	    $uri .= $key."=".urlencode($value ?? '')."&";
         }
         return rtrim($uri,"&");
     }