diff --git a/gulliver/templates/controller.exception.tpl b/gulliver/templates/controller.exception.tpl
index 204cf3544..3e77268e5 100755
--- a/gulliver/templates/controller.exception.tpl
+++ b/gulliver/templates/controller.exception.tpl
@@ -3,13 +3,11 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
 <title>Server Error :: </title>
-<link href="style.css" rel="stylesheet" type="text/css">
 </head>
 <style>
 
 .box {
     -moz-border-radius:6px; /* Rounded edges in Firefox */
-  background-image: url(/images/classic/info.gif);
   color :#000;
   border-style:solid;
   border-width:1px;
@@ -54,5 +52,4 @@
 
 </div>
 </body>
-</html>
-
+</html>
\ No newline at end of file
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 2233bef8b..a1b1184b5 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -501,8 +501,12 @@ if (defined( 'SYS_TEMP' ) && SYS_TEMP != '') {
         // including workspace shared classes -> particularlly for pmTables
         set_include_path( get_include_path() . PATH_SEPARATOR . PATH_WORKSPACE );
     } else {
-        Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
-        Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
+        if (SYS_LANG != '' && SYS_SKIN != '') {
+            Bootstrap::SendTemporalMessage( 'ID_NOT_WORKSPACE', "error" );
+            Bootstrap::header( 'location: /sys/' . SYS_LANG . '/' . SYS_SKIN . '/main/sysLogin?errno=2' );
+        } else {
+            header('location: /errors/error404.php?url=' . urlencode($_SERVER['REQUEST_URI']));
+        }
         die();
     }
 } else { //when we are in global pages, outside any valid workspace
