Index: t3lib/config_default.php
===================================================================
RCS file: /cvsroot/typo3/TYPO3core/t3lib/config_default.php,v
retrieving revision 1.86.2.2
diff -u -r1.86.2.2 config_default.php
--- t3lib/config_default.php	29 Dec 2005 21:10:18 -0000	1.86.2.2
+++ t3lib/config_default.php	14 Jan 2006 01:46:14 -0000
@@ -252,7 +252,7 @@
 $typo_db_extTableDef_script = '';	// The filename of an additional script in typo3conf/-folder which is included after tables.php. Code in this script should modify the tables.php-configuration only, and this provides a good way to extend the standard-distributed tables.php file.
 
 	// Include localconf.php. Use this file to configure TYPO3 for your needs and database
-if (!@is_file(PATH_typo3conf.'localconf.php'))	die(PATH_typo3conf.'localconf.php is not found!');
+if (!@is_file(PATH_typo3conf.'localconf.php'))	die('localconf.php is not found!');
 require(PATH_typo3conf.'localconf.php');
 
 	// Defining the database setup as constants
Index: typo3/sysext/cms/tslib/showpic.php
===================================================================
RCS file: /cvsroot/typo3/TYPO3core/typo3/sysext/cms/tslib/showpic.php,v
retrieving revision 1.13
diff -u -r1.13 showpic.php
--- typo3/sysext/cms/tslib/showpic.php	19 Nov 2005 00:01:08 -0000	1.13
+++ typo3/sysext/cms/tslib/showpic.php	14 Jan 2006 01:44:44 -0000
@@ -68,6 +68,8 @@
 define('PATH_typo3conf', PATH_site.'typo3conf/');
 define('TYPO3_mainDir', 'typo3/');		// This is the directory of the backend administration for the sites of this TYPO3 installation.
 
+if (!@is_dir(PATH_typo3conf))	die('Cannot find configuration. This file is probably executed from the wrong location.');
+
 require_once(PATH_t3lib.'class.t3lib_div.php');
 require_once(PATH_t3lib.'class.t3lib_extmgm.php');