diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index d00438ccd..84ff45aa1 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -661,8 +661,16 @@ void NppParameters::feedFileListParameters(TiXmlNode *node)
 		childNode && (_nbFile < NB_MAX_LRF_FILE);
 		childNode = childNode->NextSibling("File") )
 	{
-		_LRFileList[_nbFile] = new string((childNode->FirstChild())->Value());
-		_nbFile++;
+		TiXmlNode *node = childNode->FirstChild();
+		if (node)
+		{
+			const char *filePath = node->Value();
+			if (filePath)
+			{
+				_LRFileList[_nbFile] = new string(filePath);
+				_nbFile++;
+			}
+		}
 	}
 }
 
diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
index 8a6220f51..ad2e33fba 100644
--- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.h
@@ -529,7 +529,6 @@ public:
 			convertSelectedTextTo(UPPERCASE);
 		else
 			execute(SCI_UPPERCASE);
-		
 	};
     
 	void collapse(int level2Collapse, bool mode);