diff --git a/src/language.c b/src/language.c
index acc06443d5..2bfa90915a 100644
--- a/src/language.c
+++ b/src/language.c
@@ -29,7 +29,8 @@ const char *language_names[LANGUAGE_COUNT] = {
 	"English (UK)",		// LANGUAGE_ENGLISH_UK
 	"English (US)",		// LANGUAGE_ENGLISH_US
 	"Nederlands",		// LANGUAGE_DUTCH
-	"Fran\u00e7ais"		// LANGUAGE_FRENCH
+	"Fran\u00e7ais",	// LANGUAGE_FRENCH
+	"Polski"			// LANGUAGE_POLISH
 };
 
 const char *language_filenames[LANGUAGE_COUNT] = {
@@ -37,7 +38,8 @@ const char *language_filenames[LANGUAGE_COUNT] = {
 	"english_uk",		// LANGUAGE_ENGLISH_UK
 	"english_us",		// LANGUAGE_ENGLISH_US
 	"dutch",			// LANGUAGE_DUTCH
-	"french"			// LANGUAGE_FRENCH
+	"french",			// LANGUAGE_FRENCH
+	"polish"			// LANGUAGE_POLISH
 };
 
 int gCurrentLanguage = LANGUAGE_UNDEFINED;
@@ -199,10 +201,12 @@ void language_close()
 {
 	if (language_buffer != NULL)
 		free(language_buffer);
+	language_buffer = NULL;
 	language_buffer_size = 0;
 
 	if (language_strings != NULL)
 		free(language_strings);
+	language_strings = NULL;
 	language_num_strings = 0;
 
 	gCurrentLanguage = LANGUAGE_UNDEFINED;
diff --git a/src/language.h b/src/language.h
index 7298fae4c0..7f0f5dbc51 100644
--- a/src/language.h
+++ b/src/language.h
@@ -30,6 +30,7 @@ enum {
 	LANGUAGE_ENGLISH_US,
 	LANGUAGE_DUTCH,
 	LANGUAGE_FRENCH,
+	LANGUAGE_POLISH,
 	LANGUAGE_COUNT
 };