diff --git a/lib/PFASmarty.php b/lib/PFASmarty.php
index 218e8f05..087fc4eb 100644
--- a/lib/PFASmarty.php
+++ b/lib/PFASmarty.php
@@ -8,7 +8,7 @@ class PFASmarty {
     /**
      * @var Smarty
      */
-    protected $template = null;
+    protected $template;
 
     /**
      * @param string $template_theme 
diff --git a/lib/smarty.inc.php b/lib/smarty.inc.php
index 33b7943a..19ab1a5f 100644
--- a/lib/smarty.inc.php
+++ b/lib/smarty.inc.php
@@ -1,21 +1,28 @@
 <?php
 
+if (!isset($CONF) || !isset($PALANG)) {
+    die("environment not setup correctly");
+}
+
 require_once(dirname(__FILE__) . '/smarty/libs/Autoloader.php');
 
 require_once(dirname(__FILE__) . '/PFASmarty.php');
 
 Smarty_Autoloader::register();
 
-if(isset($CONF['theme']) && is_dir(dirname(__FILE__) ."/../templates/".$CONF['theme'])) $smarty = new PFASmarty($CONF['theme']);
-else $smarty = new PFASmarty();
+if (isset($CONF['theme']) && is_dir(dirname(__FILE__) . "/../templates/" . $CONF['theme'])) {
+    $smarty = new PFASmarty($CONF['theme']);
+} else {
+    $smarty = new PFASmarty();
+}
 
 if (!isset($rel_path)) {
     $rel_path = '';
 } # users/* sets this to '../'
 
-$CONF['theme_css']  = $rel_path . htmlentities($CONF['theme_css']);
+$CONF['theme_css'] = $rel_path . htmlentities($CONF['theme_css']);
 if (!empty($CONF['theme_custom_css'])) {
-    $CONF['theme_custom_css']  = $rel_path . htmlentities($CONF['theme_custom_css']);
+    $CONF['theme_custom_css'] = $rel_path . htmlentities($CONF['theme_custom_css']);
 }
 $CONF['theme_logo'] = $rel_path . htmlentities($CONF['theme_logo']);
 
@@ -23,7 +30,7 @@ $smarty->assign('CONF', $CONF);
 $smarty->assign('PALANG', $PALANG);
 $smarty->assign('url_domain', '');
 //*** footer.tpl
-if(!isset($version)) {
+if (!isset($version)) {
     $version = 'dev/unknown';
 }
 $smarty->assign('version', $version);