diff --git a/src/mame/drivers/neodriv.hxx b/src/mame/drivers/neodriv.hxx
index d7aea3cb8e7..25d2cca468d 100644
--- a/src/mame/drivers/neodriv.hxx
+++ b/src/mame/drivers/neodriv.hxx
@@ -8813,7 +8813,7 @@ GAME( 1994, fightfeva,  fightfev, neobase,   neogeo, neogeo_state,   neogeo,   R
 GAME( 1994, pspikes2,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Power Spikes II (NGM-068)", MACHINE_SUPPORTS_SAVE )
 GAME( 1994, sonicwi2,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Aero Fighters 2 / Sonic Wings 2", MACHINE_SUPPORTS_SAVE )
 GAME( 1995, sonicwi3,   neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Aero Fighters 3 / Sonic Wings 3", MACHINE_SUPPORTS_SAVE )
-GAME( 1995, fr2,        neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Idol Mahjong Final Romance 2", MACHINE_SUPPORTS_SAVE )
+GAME( 1995, fr2,        neogeo,   neobase,   neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Idol Mahjong Final Romance 2 (Neo-Geo)", MACHINE_SUPPORTS_SAVE )
 GAME( 1997, popbounc,   neogeo,   popbounc,  neogeo, neogeo_state,   neogeo,   ROT0, "Video System Co.", "Pop 'n Bounce / Gapporin", MACHINE_SUPPORTS_SAVE )
 
 /* Visco */
diff --git a/src/osd/modules/lib/osdobj_common.cpp b/src/osd/modules/lib/osdobj_common.cpp
index d05b17890f9..7695611b445 100644
--- a/src/osd/modules/lib/osdobj_common.cpp
+++ b/src/osd/modules/lib/osdobj_common.cpp
@@ -713,10 +713,14 @@ void osd_common_t::window_exit()
 
 void osd_common_t::input_exit()
 {
-	m_keyboard_input->exit();
-	m_mouse_input->exit();
-	m_lightgun_input->exit();
-	m_joystick_input->exit();
+	if (m_keyboard_input)
+		m_keyboard_input->exit();
+	if (m_mouse_input)
+		m_mouse_input->exit();
+	if (m_lightgun_input)
+		m_lightgun_input->exit();
+	if (m_joystick_input)
+		m_joystick_input->exit();
 }
 
 void osd_common_t::osd_exit()