diff --git a/src/devices/system/pit.c b/src/devices/system/pit.c
index 4440d4b..094d32e 100644
--- a/src/devices/system/pit.c
+++ b/src/devices/system/pit.c
@@ -646,7 +646,6 @@ setpitclock(float clock)
     MDACONST = (clock/2032125.0f);
     VGACONST1 = (clock/25175000.0f);
     VGACONST2 = (clock/28322000.0f);
-pclog("PIT: clock=%.2f, USEC=%llu, RTC=%f\n", clock, TIMER_USEC, RTCCONST);
 
     isa_timing = clock/8000000.0f;
     bus_timing = clock/(float)cpu_busspeed;
diff --git a/src/emu.h b/src/emu.h
index 120c8b9..2206f53 100644
--- a/src/emu.h
+++ b/src/emu.h
@@ -8,7 +8,7 @@
  *
  *		Main include file for the application.
  *
- * Version:	@(#)emu.h	1.0.31	2018/09/01
+ * Version:	@(#)emu.h	1.0.32	2018/09/23
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -198,6 +198,8 @@ extern void		set_screen_size_natural(void);
 
 extern const wchar_t	*get_string(int id);
 extern uint32_t		get_val(const char *str);
+extern void		*mem_alloc(size_t sz);
+#define malloc		mem_alloc
 
 #ifdef __cplusplus
 }
diff --git a/src/misc.c b/src/misc.c
index a08786f..726033b 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -8,7 +8,7 @@
  *
  *		Misc functions that do not fit anywhere else.
  *
- * Version:	@(#)misc.c	1.0.1	2018/05/09
+ * Version:	@(#)misc.c	1.0.2	2018/09/22
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -50,7 +50,9 @@
 #include <stdlib.h>
 #include <wchar.h>
 #include "emu.h"
+#undef malloc
 #include "plat.h"
+#include "ui/ui.h"
 
 
 const wchar_t *
@@ -85,3 +87,26 @@ get_val(const char *str)
 
     return(l);
 }
+
+
+/* Safe version of malloc(3) that catches NULL returns. */
+void *
+mem_alloc(size_t sz)
+{
+    void *ptr = malloc(sz);
+
+    if (ptr == NULL) {
+	ui_msgbox(MBX_ERROR|MBX_FATAL, (wchar_t *)IDS_ERR_NOMEM);
+
+	/* Try to write to the logfile. This may not work anymore. */
+	pclog("FATAL: system out of memory!\n");
+	fflush(stdlog);
+	fclose(stdlog);
+
+	/* Now exit - this will (hopefully..) not return. */
+	exit(-1);
+	/*NOTREACHED*/
+    }
+
+    return(ptr);
+}
diff --git a/src/pc.c b/src/pc.c
index 339b353..d2d7d03 100644
--- a/src/pc.c
+++ b/src/pc.c
@@ -819,6 +819,7 @@ pc_init(void)
     wchar_t temp[1024];
     wchar_t name[128];
     const wchar_t *str;
+    const char *stransi;
 
     /* If no machine selected, force user into Setup Wizard. */
     if (machine < 0) {
@@ -851,7 +852,12 @@ pc_init(void)
 	!video_card_available(video_old_to_new(video_card))) {
 	/* Whoops, selected video not available. */
 	str = get_string(IDS_ERR_NOVIDEO);
-	mbstowcs(name, machine_getname(), sizeof_w(name));
+	stransi = video_card_getname(video_card);
+	if (stransi == NULL) {
+		/* This happens if configured card is not even in table.. */
+		swprintf(name, sizeof_w(name), L"%i", video_card);
+	} else
+		mbstowcs(name, stransi, sizeof_w(name));
 	swprintf(temp, sizeof_w(temp), str, name);
 
 	/* Show the messagebox, and abort if 'No' was selected. */
diff --git a/src/ui/lang/VARCem-BY.str b/src/ui/lang/VARCem-BY.str
index 870c89c..909941e 100644
--- a/src/ui/lang/VARCem-BY.str
+++ b/src/ui/lang/VARCem-BY.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Belorussian (Belarus)" language.
  *
- * Version:	@(#)VARCem-BY.str	1.0.4	2018/09/03
+ * Version:	@(#)VARCem-BY.str	1.0.5	2018/09/23
  *
  * Authors:	paul_met, <paul_met@yandex.ru>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -66,6 +66,7 @@
 #define STR_2204	"Няправільная прылада PCap"
 #define STR_2205	"Немагчыма ініцыялізаваць OpenAL, пераканайцеся ў наяўнасці наступнай бібліятэкі\nу вашым каталогу з прыкладаннем:\n\nlibopenal-1.dll"
 #define STR_2206	"Немагчыма ініцыялізаваць FluidSynth, пераканайцеся ў наяўнасці наступнай бібліятэкі\nу вашым каталогу з прыкладаннем:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -77,7 +78,7 @@
 #define STR_2305	"Выбранны рэндэрэр '%S' недаступны. Выкарыстоўваць асноўны?"
 #define STR_2306	"ST506 і ESDI дыскаводы CD-ROM ніколі не існавалі"
 #define STR_2307	"USB пакуль не падтрымліваецца"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308        "You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-CZ.str b/src/ui/lang/VARCem-CZ.str
index e7707c6..5721e90 100644
--- a/src/ui/lang/VARCem-CZ.str
+++ b/src/ui/lang/VARCem-CZ.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Czech (Czech Republic)" language.
  *
- * Version:	@(#)VARCem-CZ.str	1.0.3	2018/09/03
+ * Version:	@(#)VARCem-CZ.str	1.0.4	2018/09/23
  *
  * Authors:	David Hrdlička, <hrdlickadavid@outlook.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204	"Neplatné PCap zařížení"
 #define STR_2205	"Nebylo možné načíst OpenAL. Ověřte, zda je následující soubor\nve složce s programem:\n\nlibopenal-1.dll"
 #define STR_2206	"Nebylo možné načíst FluidSynth. Ověřte, zda je následující soubor\nve složce s programem:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305	"Zvolený renderer '%S' není dostupný. Chcete použít výchozí renderer?"
 #define STR_2306	"CD-ROM jednotky pro ST506 a ESDI nikdy neexistovaly."
 #define STR_2307	"USB není zatím podporováno."
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308	"You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-DE.str b/src/ui/lang/VARCem-DE.str
index e4e4a79..6484f4c 100644
--- a/src/ui/lang/VARCem-DE.str
+++ b/src/ui/lang/VARCem-DE.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "German (Germany)" language.
  *
- * Version:	@(#)VARCem-DE.str	1.0.10	2018/09/04
+ * Version:	@(#)VARCem-DE.str	1.0.11	2018/09/23
  *
  * Authors:	Michael Drüing, <michael@drueing.de>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -48,7 +48,7 @@
  */
 
 /* Do not translate! */
-#define TAG_VERSION	1,0,10
+#define TAG_VERSION	1,0,11
 #define TAG_AUTHOR	"Michael Drüing"
 #define TAG_EMAIL	"michael@drueing.de"
 
@@ -67,6 +67,7 @@
 #define STR_2204	"Ungültiges PCap-Gerät"
 #define STR_2205	"OpenAL konnte nicht initialisiert werden, bitte stellen Sie sicher, dass sich die\nfolgende Laufzeitbibliothek in Ihrem Programmordner befindet:\n\nlibopenal-1.dll"
 #define STR_2206	"FluidSynth konnte nicht initialisiert werden, bitte stellen Sie sicher, dass sich die\nfolgende Laufzeitbibliothek in Ihrem Programmordner befindet:\n\nlibfluidsynth.dll"
+#define STR_2207	"Nicht genügend Hauptspeicher!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305	"Gewählter Anzeigetreiber '%S' nicht verfügbar. Auf Standard zurücksetzen?"
 #define STR_2306	"Es gab nie ST506 oder ESDI CD-ROM Laufwerke"
 #define STR_2307	"USB wird noch nicht unterstützt"
-#define STR_2308	"Die neuen Einstellungen müssen erst gespeichert werden!"
+#define STR_2308	"Die Einstellungen müssen erst gespeichert werden!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-DU.str b/src/ui/lang/VARCem-DU.str
index cf946a7..35b8855 100644
--- a/src/ui/lang/VARCem-DU.str
+++ b/src/ui/lang/VARCem-DU.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Dutch (Netherlands)" language.
  *
- * Version:	@(#)VARCem-DU.str	1.0.10	2018/09/03
+ * Version:	@(#)VARCem-DU.str	1.0.11	2018/09/23
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -46,7 +46,7 @@
  */
 
 /* Do not translate! */
-#define TAG_VERSION	1,0,10
+#define TAG_VERSION	1,0,11
 #define TAG_AUTHOR	"Fred N. van Kempen"
 #define TAG_EMAIL	"waltje@varcem.com"
 
@@ -65,6 +65,7 @@
 #define STR_2204	"Ongeldig PCap apparaat"
 #define STR_2205	"Kon OpenAL niet initialiseren, controleer of u het volgende bestand\nin de programmamap heeft:\n\nlibopenal-1.dll"
 #define STR_2206	"Kon FluidSynth niet initialiseren, controleer of u het volgende bestand\nin de programmamap heeft:\n\nlibfluidsynth.dll"
+#define STR_2207	"Het systeem heeft geen geheugen meer vrij!"
 
 
 /* Application error messages (2300.) */
@@ -76,7 +77,7 @@
 #define STR_2305	"Ingestelde renderer '%S' niet beschikbaar - wilt u deze naar standaardwaarde terugzetten?"
 #define STR_2306	"ST506/ESDI CD-ROM stations hebben nooit bestaan"
 #define STR_2307	"USB wordt nog niet ondersteund"
-#define STR_2308        "De nieuwe instellingen dienen eerst te worden opgeslagen!"
+#define STR_2308        "De instellingen dienen eerst te worden opgeslagen!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-EN.str b/src/ui/lang/VARCem-EN.str
index 0cae447..e69e5db 100644
--- a/src/ui/lang/VARCem-EN.str
+++ b/src/ui/lang/VARCem-EN.str
@@ -13,7 +13,7 @@
  *		it as the line-by-line base for the translated version, and
  *		update fields as needed.
  *
- * Version:	@(#)VARCem-EN.str	1.0.9	2018/09/03
+ * Version:	@(#)VARCem-EN.str	1.0.10	2018/09/23
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -70,6 +70,7 @@
 #define STR_2204	"Invalid PCap device"
 #define STR_2205	"Unable to initialize OpenAL, make sure you have the following library\nin your program folder:\n\nlibopenal-1.dll"
 #define STR_2206	"Unable to initialize FluidSynth, make sure you have the following library\nin your program folder:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
diff --git a/src/ui/lang/VARCem-ES.str b/src/ui/lang/VARCem-ES.str
index 11eb497..ab83946 100644
--- a/src/ui/lang/VARCem-ES.str
+++ b/src/ui/lang/VARCem-ES.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Spanish (Spain, Normal Sort)" language.
  *
- * Version:	@(#)VARCem-ES.str	1.0.9	2018/09/04
+ * Version:	@(#)VARCem-ES.str	1.0.10	2018/09/23
  *
  * Authors:	Natalia Portillo, <claunia@claunia.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -48,7 +48,7 @@
  */
 
 /* Do not translate! */
-#define TAG_VERSION	1,0,9
+#define TAG_VERSION	1,0,10
 #define TAG_AUTHOR	"Natalia Portillo"
 #define TAG_EMAIL	"claunia@claunia.com"
 
@@ -68,6 +68,7 @@
 #define STR_2204	"Dispositivo PCap no válido"
 #define STR_2205	"No se pudo inicializar OpenAL, compruebe que la siguiente librería está en\nla carpeta del programa:\n\nlibopenal-1.dll"
 #define STR_2206	"No se pudo inicializar FluidSynth, compruebe que la siguiente librería está en\n la carpeta del programa:\n\nlibfluidsynth.dll"
+#define STR_2207	"¡Memoria insuficiente!"
 
 
 /* Mensajes de error de aplicación (2300.) */
@@ -79,7 +80,7 @@
 #define STR_2305	"El renderizador '%S' seleccionado no está disponible. ¿Establecer renderizador por defecto?"
 #define STR_2306	"Las unidades de CD-ROM ST506 o ESDI CD-ROM nunca existieron"
 #define STR_2307	"El USB no está soportado aún"
-#define STR_2308	"¡Debe guardar la nueva configuración primero!"
+#define STR_2308	"¡Debe guardar la configuración primero!"
 
 
 /* Mensajes de aplicación (2400.) */
diff --git a/src/ui/lang/VARCem-FI.str b/src/ui/lang/VARCem-FI.str
index af84c2c..564da06 100644
--- a/src/ui/lang/VARCem-FI.str
+++ b/src/ui/lang/VARCem-FI.str
@@ -13,7 +13,7 @@
  *		it as the line-by-line base for the translated version, and
  *		update fields as needed.
  *
- * Version:	@(#)VARCem-FI.str	1.0.7	2018/09/03
+ * Version:	@(#)VARCem-FI.str	1.0.8	2018/09/23
  *
  * Authors:	Daniel Gurney, <dgurney@varcem.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -53,7 +53,7 @@
  */
 
 /* Do not translate! */
-#define TAG_VERSION	1,0,7
+#define TAG_VERSION	1,0,8
 #define TAG_AUTHOR	"Daniel Gurney"
 #define TAG_EMAIL	"dgurney@varcem.com"
 
@@ -72,6 +72,7 @@
 #define STR_2204	"Vääränlainen PCap-laite"
 #define STR_2205	"OpenALia ei voitu alustaa, varmista että seuraava kirjasto\non ohjelman kansiossa:\n\nlibopenal-1.dll"
 #define STR_2206	"FluidSynthiä ei voitu alustaa, varmista että seuraava tiedosto\non ohjelman kansiossa:\n\nlibfluidsynth.dll"
+#define STR_2207	"Järjestelmän muisti on täynnä!"
 
 
 /* Application error messages (2300.) */
diff --git a/src/ui/lang/VARCem-FR.str b/src/ui/lang/VARCem-FR.str
index f489c56..c9ba2c6 100644
--- a/src/ui/lang/VARCem-FR.str
+++ b/src/ui/lang/VARCem-FR.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "French (France)" language.
  *
- * Version:	@(#)VARCem-FR.str	1.0.10	2018/09/04
+ * Version:	@(#)VARCem-FR.str	1.0.11	2018/09/23
  *
  * Authors:	Altheos, <altheos@varcem.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -68,6 +68,7 @@
 #define STR_2204	"Périphérique PCap non valide"
 #define STR_2205	"Impossible de démarrer OpenAL, vérifiez que vous disposez de la bibliothèque suivante\ndans le dossier du programme:\n\nlibopenal-1.dll"
 #define STR_2206	"Impossible de démarrer FluidSynth, vérifiez que vous disposez des bibliothèques suivantes\ndans le dossier du programme:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
diff --git a/src/ui/lang/VARCem-IT.str b/src/ui/lang/VARCem-IT.str
index 4284bec..b00e455 100644
--- a/src/ui/lang/VARCem-IT.str
+++ b/src/ui/lang/VARCem-IT.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Italian (Italy)" language.
  *
- * Version:	@(#)VARCem-IT.str	1.0.7	2018/09/03
+ * Version:	@(#)VARCem-IT.str	1.0.8	2018/09/23
  *
  * Authors:	Miran Grca, <mgrca8@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204	"Dispositivo PCap non valido"
 #define STR_2205	"Non è possibile inizializzare OpenAL, assicurarsi che le seguenti biblioteche\nsiano nella cartella del programma:\n\nlibopenal-1.dll"
 #define STR_2206	"Non è possibile inizializzare FluidSynth, assicurarsi che le seguenti biblioteche\nsiano nella cartella del programma:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305	"Il renderer selezionato '%S' non è disponibile. Riporlo all'opzione predefinita?"
 #define STR_2306	"Unità CD-ROM ST506 o ESDI CD-ROM non sono mai esistite"
 #define STR_2307	"USB non è ancora supportato"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308	"You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-JP.str b/src/ui/lang/VARCem-JP.str
index b23266a..c5c0ee8 100644
--- a/src/ui/lang/VARCem-JP.str
+++ b/src/ui/lang/VARCem-JP.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Japanese (Japan)" language.
  *
- * Version:	@(#)VARCem-JP.str	1.0.9	2018/09/09
+ * Version:	@(#)VARCem-JP.str	1.0.10	2018/09/23
  *
  * Authors:	Basic2004, <basic2004@gmail.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204	"不正なPCapデバイスです"
 #define STR_2205	"OpenALが初期化できません、\nプログラムのフォルダーから下記のライブラリーファイルをご確認ください:\n\nlibopenal-1.dll"
 #define STR_2206	"FluidSynthが初期化できません、\nプログラムのフォルダーから下記のライブラリーファイルをご確認ください:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305	"設定したレンダラー「%S」は使用できません。既定値に戻しますか？"
 #define STR_2306	"ST506またはESDI方式のCD-ROMドライブは存在しません"
 #define STR_2307	"USBはまだサポートしません"
-#define STR_2308        "まずは新規設定を保存してください！"
+#define STR_2308	"まずは新規設定を保存してください！"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-KR.str b/src/ui/lang/VARCem-KR.str
index beae9b1..f5f9a59 100644
--- a/src/ui/lang/VARCem-KR.str
+++ b/src/ui/lang/VARCem-KR.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Korean (South Korea)" language.
  *
- * Version:	@(#)VARCem-KR.str	1.0.11	2018/09/04
+ * Version:	@(#)VARCem-KR.str	1.0.12	2018/09/23
  *
  * Authors:	Yeong Uk Jo, <greatpsycho@yahoo.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204	"PCap 장치가 올바르지 않습니다"
 #define STR_2205	"OpenAL을 초기화할 수 없습니다, 프로그램 폴더에 아래의 라이브러리 파일이 있는지 확인하세요:\n\nlibopenal-1.dll"
 #define STR_2206	"FluidSynth를 초기화할 수 없습니다, 프로그램 폴더에 아래의 라이브러리 파일이 있는지 확인하세요:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
diff --git a/src/ui/lang/VARCem-KZ.str b/src/ui/lang/VARCem-KZ.str
index a60c5b0..b1588ac 100644
--- a/src/ui/lang/VARCem-KZ.str
+++ b/src/ui/lang/VARCem-KZ.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Kazakh (Kazakhstan)" language.
  *
- * Version:	@(#)VARCem-KZ.str	1.0.3	2018/09/03
+ * Version:	@(#)VARCem-KZ.str	1.0.4	2018/09/23
  *
  * Authors:	Arbars Zagadkin, <arbars.zagadkin@mail.ru>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -66,6 +66,7 @@
 #define STR_2204	"PCap құрылғысы дұрыс емес"
 #define STR_2205	"OpenAL бастапқы жуктемеу мүмкін емес, сіздің бағдарламен бумасына \nкелесі кітапханасың қол жетімді тексерініз\n :\n\nlibopenal-1.dll"
 #define STR_2206	"FluidSynth бастапқы жуктемеу мүмкін емес, сіздің бағдарламен бумасына \nкелесі кітапханасың қол жетімді тексерініз\n :\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -77,7 +78,7 @@
 #define STR_2305	"'%S' рендерері қол жетімсіз. Использовать основной? Негізгі пайдалау ма?"
 #define STR_2306	"ST506 және ESDI CD-ROM табақжаджүргізіктер ешқашан болмайды"
 #define STR_2307	"USB алайда қол жетімсіз"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308        "You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-LT.str b/src/ui/lang/VARCem-LT.str
index 8879c01..05bd3e2 100644
--- a/src/ui/lang/VARCem-LT.str
+++ b/src/ui/lang/VARCem-LT.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Lithuanian (Lithuania)" language.
  *
- * Version:	@(#)VARCem-LT.str	1.0.4	2018/09/03
+ * Version:	@(#)VARCem-LT.str	1.0.5	2018/09/23
  *
  * Author:	Vegas (emu-land.net)
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -66,6 +66,7 @@
 #define STR_2204	"Netinkamas PCap įrenginys"
 #define STR_2205	"Nepavyko inicijuoti OpenAL, įsitikinkite, kad jūsų programoje yra ši biblioteka aplankale:\n\nlibopenal-1.dll"
 #define STR_2206	"Nepavyko inicijuoti FluidSynth, įsitikinkite, kad jūsų programoje yra ši biblioteka aplankale:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -77,7 +78,7 @@
 #define STR_2305	"Pasirinktas renderis '%S' nepasiekiamas. Atstatyti pagal nutylėjimą?"
 #define STR_2306	"ST506 arba ESDI CD-ROM diskai niekada nebuvo"
 #define STR_2307	"USB dar nepalaikomas"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308        "You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-NO.str b/src/ui/lang/VARCem-NO.str
index 9bcb38e..a56e3de 100644
--- a/src/ui/lang/VARCem-NO.str
+++ b/src/ui/lang/VARCem-NO.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Norwegian (Norway)" language.
  *
- * Version:	@(#)VARCem-NO.str	1.0.3	2018/09/03
+ * Version:	@(#)VARCem-NO.str	1.0.4	2018/09/23
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Tore Sinding Bekkedal, <toresbe@gmail.com<
@@ -66,6 +66,7 @@
 #define STR_2204	"Ugyldig PCap-enhet"
 #define STR_2205	"Kunne ikke ta i bruk OpenAL, bekreft at du har følgende bibliotek\ni din programkatalog:\n\nlibopenal-1.dll"
 #define STR_2206	"Kunne ikke ta i bruk FluidSynth, bekreft at du har følgende bibliotek\ni din programkatalog:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -77,7 +78,7 @@
 #define STR_2305	"Valgte rendermotor '%S' ikke tilgjengelig. Tilbakestille til forvalgt?"
 #define STR_2306	"Hverken ST506 eller ESDI CD-ROM-enheter har noensinne eksistert"
 #define STR_2307	"USB er ikke støttet enda."
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308        "You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-RU.str b/src/ui/lang/VARCem-RU.str
index c9e95a1..453cf3b 100644
--- a/src/ui/lang/VARCem-RU.str
+++ b/src/ui/lang/VARCem-RU.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Russian (Russia)" language.
  *
- * Version:	@(#)VARCem-RU.str	1.0.14	2018/09/04
+ * Version:	@(#)VARCem-RU.str	1.0.15	2018/09/23
  *
  * Authors:	Tarlabnor, <tarlabnor@varcem.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -47,7 +47,7 @@
  */
 
 /* Do not translate! */
-#define TAG_VERSION	1,0,14
+#define TAG_VERSION	1,0,15
 #define TAG_AUTHOR	"Tarlabnor"
 #define TAG_EMAIL	"tarlabnor@varcem.com"
 
@@ -66,6 +66,7 @@
 #define STR_2204	"Неверное устройство PCap"
 #define STR_2205	"Невозможно инициализировать OpenAL, убедитесь в наличии следующей библиотеки\nв вашей папке с программой:\n\nlibopenal-1.dll"
 #define STR_2206	"Невозможно инициализировать FluidSynth, убедитесь в наличии следующей библиотеки\nв вашей папке с программой:\n\nlibfluidsynth.dll"
+#define STR_2207	"Недостаточно памяти !"
 
 
 /* Application error messages (2300.) */
diff --git a/src/ui/lang/VARCem-SL.str b/src/ui/lang/VARCem-SL.str
index ad7378c..352a687 100644
--- a/src/ui/lang/VARCem-SL.str
+++ b/src/ui/lang/VARCem-SL.str
@@ -8,7 +8,7 @@
  *
  *		String definitions for "Slovenian (Slovenia)" language.
  *
- * Version:	@(#)VARCem-SL.str	1.0.6	2018/09/03
+ * Version:	@(#)VARCem-SL.str	1.0.7	2018/09/23
  *
  * Authors:	David Simunic, <simunic.david@outlook.com>
  *		Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204	"Neveljavna PCap naprava"
 #define STR_2205	"Ne morem inicializirati OpenAL, prepričajte se, da imate naslednjo knjižico\nv svoji mapi programa:\n\nlibopenal-1.dll"
 #define STR_2206	"Ne morem inicializirati FluidSynth, prepričajte se, da imate naslednjo knjižico\nv svoji mapi programa:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305	"Izbran upodabljalnik '%S' ni na voljo. Ponastavim na privzetega?"
 #define STR_2306	"ST506 ali ESDI CD-ROM pogoni niso obstajali"
 #define STR_2307	"USB še ni podprt"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308	"You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/lang/VARCem-UA.str b/src/ui/lang/VARCem-UA.str
index b328d10..a9cb628 100644
--- a/src/ui/lang/VARCem-UA.str
+++ b/src/ui/lang/VARCem-UA.str
@@ -8,7 +8,7 @@
  *
  *              String definitions for "Ukrainian (Ukraine)" language.
  *
- * Version:     @(#)VARCem-UA.str	1.0.5	2018/09/03
+ * Version:     @(#)VARCem-UA.str	1.0.6	2018/09/23
  *
  * Authors:     .SVD., <old-dos.ru>
  *              Fred N. van Kempen, <decwiz@yahoo.com>
@@ -67,6 +67,7 @@
 #define STR_2204        "Невiрний пристрiй PCap"
 #define STR_2205        "Неможливо iнiцiювати OpenAL, переконайтесь в iснуваннi такої бiблiотеки\nу каталозi програми:\n\nlibopenal-1.dll"
 #define STR_2206        "Неможливо iнiцiювати FluidSynth, переконайтесь в iснуваннi такої бiблiотеки\nу каталозi програми:\n\nlibfluidsynth.dll"
+#define STR_2207	"System out of memory!"
 
 
 /* Application error messages (2300.) */
@@ -78,7 +79,7 @@
 #define STR_2305        "Обраний рендер '%S' недосяжний. Використати головний?"
 #define STR_2306        "ST506 та ESDI дисководы CD-ROM нiколи не iснували"
 #define STR_2307        "USB поки що не пiдтримується"
-#define STR_2308        "You must save your new settings first!"
+#define STR_2308	"You must save your settings first!"
 
 
 /* Application messages (2400.) */
diff --git a/src/ui/ui_resource.h b/src/ui/ui_resource.h
index f11a3f7..15b26d2 100644
--- a/src/ui/ui_resource.h
+++ b/src/ui/ui_resource.h
@@ -12,7 +12,7 @@
  *		they are not referenced outside of the platform UI. This
  *		may change at some point.
  *
- * Version:	@(#)ui_resource.h	1.0.16	2018/09/21
+ * Version:	@(#)ui_resource.h	1.0.17	2018/09/23
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -213,6 +213,7 @@
 #define IDS_ERR_PCAP_DEV 2204		// "Invalid PCap device"
 #define IDS_ERR_OPENAL	2205		// "Unable to initialize OpenAL.."
 #define IDS_ERR_FSYNTH	2206		// "Unable to initialize Flui.."
+#define IDS_ERR_NOMEM	2207		// "System out of memory"
 
 /* Application error messages (2300.) */
 #define IDS_ERR_SCRSHOT	2300		// "Unable to create bitmap file: %s"
diff --git a/src/version.h b/src/version.h
index 5e150b1..718a3fe 100644
--- a/src/version.h
+++ b/src/version.h
@@ -8,7 +8,7 @@
  *
  *		Define application version and build info.
  *
- * Version:	@(#)version.h	1.0.20	2018/09/10
+ * Version:	@(#)version.h	1.0.20	2018/09/22
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -55,7 +55,7 @@
 #define EMU_VER_MAJOR	0
 #define EMU_VER_MINOR	1
 #define EMU_VER_REV	6
-#define EMU_VER_PATCH	5
+#define EMU_VER_PATCH	6
 
 
 /* Standard C preprocessor macros. */
diff --git a/src/win/VARCem-common.rc b/src/win/VARCem-common.rc
index 6ee9ef1..0352591 100644
--- a/src/win/VARCem-common.rc
+++ b/src/win/VARCem-common.rc
@@ -8,7 +8,7 @@
  *
  *		Common resources for the application.
  *
- * Version:	@(#)VARCem-common.rc	1.0.9	2018/09/03
+ * Version:	@(#)VARCem-common.rc	1.0.10	2018/09/23
  *
  * Author:	Fred N. van Kempen, <decwiz@yahoo.com>
  *
@@ -655,6 +655,7 @@ BEGIN
     IDS_ERR_PCAP_DEV	STR_2204
     IDS_ERR_OPENAL	STR_2205
     IDS_ERR_FSYNTH	STR_2206
+    IDS_ERR_NOMEM	STR_2207
 END
 
 /* Application error messages (2300.) */
diff --git a/src/win/win.c b/src/win/win.c
index f20e574..bdb7f45 100644
--- a/src/win/win.c
+++ b/src/win/win.c
@@ -8,7 +8,7 @@
  *
  *		Platform main support module for Windows.
  *
- * Version:	@(#)win.c	1.0.19	2018/09/03
+ * Version:	@(#)win.c	1.0.20	2018/09/23
  *
  * Authors:	Fred N. van Kempen, <decwiz@yahoo.com>
  *		Miran Grca, <mgrca8@gmail.com>
@@ -49,6 +49,7 @@
 #include <fcntl.h>
 #include <wchar.h>
 #include "../emu.h"
+#undef malloc
 #include "../version.h"
 #include "../config.h"
 #include "../device.h"