diff --git a/src/servers/app/ServerFont.cpp b/src/servers/app/ServerFont.cpp
index a26c15740b..6102961bce 100644
--- a/src/servers/app/ServerFont.cpp
+++ b/src/servers/app/ServerFont.cpp
@@ -244,7 +244,8 @@ ServerFont::SetStyle(FontStyle* style)
 {
 	if (style && style != fStyle) {
 		// detach from old style
-		fStyle->Release();
+		if (fStyle != NULL)
+			fStyle->Release();
 
 		// attach to new style
 		fStyle = style;