diff --git a/src/config/AdminException.cpp b/src/config/AdminException.cpp
index 4f9893a300..38229462ca 100644
--- a/src/config/AdminException.cpp
+++ b/src/config/AdminException.cpp
@@ -63,6 +63,9 @@ void AdminException::setLocation(const Firebird::PathName& file, int lineNumber)
 	fileName = file;
 	Firebird::string buffer;
 
-	buffer.printf("%s, line %d: %s", fileName.c_str(), lineNumber, text.c_str());
+	if (fileName.isEmpty())
+		buffer.printf("line %d: %s", lineNumber, text.c_str());
+	else
+		buffer.printf("%s, line %d: %s", fileName.c_str(), lineNumber, text.c_str());
 	text = buffer;
 }
diff --git a/src/config/InputStream.cpp b/src/config/InputStream.cpp
index 32eb4e11bb..2076421857 100644
--- a/src/config/InputStream.cpp
+++ b/src/config/InputStream.cpp
@@ -104,7 +104,7 @@ void InputStream::release()
 
 const char* InputStream::getFileName() const
 {
-	return NULL;
+	return "";
 }
 
 InputFile* InputStream::getInputFile()