diff --git a/t/Asset/Asset.t b/t/Asset/Asset.t
index 9c0304da0..a052663bc 100644
--- a/t/Asset/Asset.t
+++ b/t/Asset/Asset.t
@@ -811,10 +811,14 @@ is($iufpAsset3->getUrl, '/inheriturlfromparent01/inheriturlfromparent02/inheritu
 
 
 END {
-    $session->config->set( 'extrasURL',    $origExtras);
-    $session->config->set( 'uploadsURL',   $origUploads);
-    $session->setting->set('urlExtension', $origUrlExtension);
-    $session->setting->set('notFoundPage', $origNotFoundPage);
+    $session->config->set( 'extrasURL',    $origExtras)
+        if defined $origExtras;
+    $session->config->set( 'uploadsURL',   $origUploads)
+        if defined $origUploads;
+    $session->setting->set('urlExtension', $origUrlExtension)
+        if defined $origUrlExtension;
+    $session->setting->set('notFoundPage', $origNotFoundPage)
+        if defined $origNotFoundPage;
     if (defined $origAssetAddPrivileges) {
         $session->config->set('assetAddPrivilege', $origAssetAddPrivileges);
     }
diff --git a/t/lib/WebGUI/Test.pm b/t/lib/WebGUI/Test.pm
index 7c9c30b77..2ea1ea33d 100644
--- a/t/lib/WebGUI/Test.pm
+++ b/t/lib/WebGUI/Test.pm
@@ -84,7 +84,6 @@ BEGIN {
     unless ( File::Spec->file_name_is_absolute($WEBGUI_ROOT) ) {
         $WEBGUI_ROOT = File::Spec->rel2abs($WEBGUI_ROOT);
     }
-    warn $WEBGUI_ROOT."\n";
 
     $CONFIG_FILE = ( File::Spec->splitpath( $WEBGUI_ROOT ) )[2];
     $WEBGUI_ROOT = substr( $WEBGUI_ROOT, 0, index( $WEBGUI_ROOT, File::Spec->catdir( 'etc', $CONFIG_FILE ) ) );