diff --git a/src/archutils/Win32/GraphicsWindow.cpp b/src/archutils/Win32/GraphicsWindow.cpp
index b2ebd0d722..6b289d122b 100644
--- a/src/archutils/Win32/GraphicsWindow.cpp
+++ b/src/archutils/Win32/GraphicsWindow.cpp
@@ -14,6 +14,7 @@
 #include "CommandLineActions.h"
 #include "DirectXHelpers.h"
 
+#include <optional>
 #include <set>
 
 static const RString g_sClassName = PRODUCT_ID;
@@ -50,6 +51,19 @@ static RString GetNewWindow()
 	return sName;
 }
 
+static std::optional<DEVMODE> GetDisplaySettings(const RString& displayId)
+{
+	DEVMODE dm;
+	ZERO( dm );
+	dm.dmSize = sizeof(dm);
+	if (!EnumDisplaySettings(displayId, ENUM_CURRENT_SETTINGS, &dm))
+	{
+		LOG->Warn("%s", werr_ssprintf(GetLastError(), "EnumDisplaySettings failed").c_str());
+		return std::nullopt;
+	}
+	return dm;
+}
+
 static LRESULT CALLBACK GraphicsWindow_WndProc( HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam )
 {
 	CHECKPOINT_M( ssprintf("%p, %u, %08x, %08x", hWnd, msg, wParam, lParam) );
@@ -182,35 +196,26 @@ static LRESULT CALLBACK GraphicsWindow_WndProc( HWND hWnd, UINT msg, WPARAM wPar
 	CHECKPOINT_M( ssprintf("%p, %u, %08x, %08x", hWnd, msg, wParam, lParam) );
 
 	if( m_bWideWindowClass )
+	{
 		return DefWindowProcW( hWnd, msg, wParam, lParam );
+	}
 	else
+	{
 		return DefWindowProcA( hWnd, msg, wParam, lParam );
+	}
 }
 
 static void AdjustVideoModeParams( VideoModeParams &p )
 {
-	DEVMODE dm;
-	ZERO( dm );
-	dm.dmSize = sizeof(dm);
-	if (!EnumDisplaySettings(p.sDisplayId, ENUM_CURRENT_SETTINGS, &dm))
+	std::optional<DEVMODE> dmOpt = GetDisplaySettings(p.sDisplayId);
+	if (!dmOpt.has_value())
 	{
 		p.rate = 60;
-		LOG->Warn( "%s", werr_ssprintf(GetLastError(), "EnumDisplaySettings failed").c_str() );
 		return;
 	}
 
-	/* On a nForce 2 IGP on Windows 98, dm.dmDisplayFrequency sometimes 
-	 * (but not always) is 0.
-	 *
-	 * MSDN: When you call the EnumDisplaySettings function, the 
-	 * dmDisplayFrequency member may return with the value 0 or 1. 
-	 * These values represent the display hardware's default refresh rate. 
-	 * This default rate is typically set by switches on a display card or 
-	 * computer motherboard, or by a configuration program that does not 
-	 * use Win32 display functions such as ChangeDisplaySettings. */
-	if( !(dm.dmFields & DM_DISPLAYFREQUENCY) ||
-		dm.dmDisplayFrequency == 0 ||
-		dm.dmDisplayFrequency == 1 )
+	const DEVMODE& dm = *dmOpt;
+	if (!(dm.dmFields & DM_DISPLAYFREQUENCY) || dm.dmDisplayFrequency == 0 || dm.dmDisplayFrequency == 1)
 	{
 		p.rate = 60;
 		LOG->Warn( "EnumDisplaySettings doesn't know what the refresh rate is. %d %d %d", dm.dmPelsWidth, dm.dmPelsHeight, dm.dmBitsPerPel );
@@ -233,9 +238,13 @@ RString GraphicsWindow::SetScreenMode( const VideoModeParams &p )
 		return RString();
 	}
 
-	DEVMODE DevMode;
-	ZERO( DevMode );
-	DevMode.dmSize = sizeof(DEVMODE);
+	std::optional<DEVMODE> dmOpt = GetDisplaySettings(p.sDisplayId);
+	if (!dmOpt.has_value())
+	{
+		return "Couldn't retrieve display settings";
+	}
+
+	DEVMODE DevMode = *dmOpt;
 	DevMode.dmPelsWidth = p.width;
 	DevMode.dmPelsHeight = p.height;
 	DevMode.dmBitsPerPel = p.bpp;
@@ -255,9 +264,11 @@ RString GraphicsWindow::SetScreenMode( const VideoModeParams &p )
 		ret = ChangeDisplaySettingsEx( p.sDisplayId, &DevMode, nullptr, CDS_FULLSCREEN, nullptr );
 	}
 
-	// XXX: append error
 	if( ret != DISP_CHANGE_SUCCESSFUL )
+	{
+		LOG->Warn("ChangeDisplaySettingsEx failed with error code: %d", ret);
 		return "Couldn't set screen mode";
+	}
 
 	g_FullScreenDevMode = DevMode;
 	return RString();