diff --git a/lib/phast/server/System.inc.php b/lib/phast/server/System.inc.php
index 9f18483..dc40aea 100644
--- a/lib/phast/server/System.inc.php
+++ b/lib/phast/server/System.inc.php
@@ -406,7 +406,7 @@
 		{
 			$torepl = System::GetConfigurationValue("Application.BasePath");
 			$torepl_nontenanted = $torepl;
-
+			
 			if (!$forceNonTenanted)
 			{
 				$tenantName = System::GetTenantName();
@@ -416,6 +416,9 @@
 				}
 			}
 
+			if ($torepl_nontenanted === null) {
+				$torepl_nontenanted = "";
+			}
 			$retval_nontenanted = str_replace("~", $torepl_nontenanted, $path);
 			$physicalFilePath = System::GetApplicationPath() . $retval_nontenanted;
 			
@@ -425,6 +428,10 @@
 			}
 			else
 			{
+				if ($torepl === null)
+				{
+					$torepl = "";
+				}
 				$retval = str_replace("~~", $torepl_nontenanted, $path);
 				$retval = str_replace("~", $torepl, $retval);
 			}