diff --git a/reactos/subsystems/win32/win32k/objects/text.c b/reactos/subsystems/win32/win32k/objects/text.c
index 2939b829877..91941f12016 100644
--- a/reactos/subsystems/win32/win32k/objects/text.c
+++ b/reactos/subsystems/win32/win32k/objects/text.c
@@ -3280,12 +3280,11 @@ NtGdiGetSetTextCharExtra( HDC hDC, INT CharExtra, BOOL Set)
   if (!dc)
     {
        SetLastWin32Error(ERROR_INVALID_HANDLE);
+       return Ret;
     }
-  else
-    {  
-       Ret = dc->w.charExtra;
-       if( Set ) dc->w.charExtra = CharExtra;
-    }
+  Ret = dc->w.charExtra;
+  if( Set ) dc->w.charExtra = CharExtra;
+  DC_UnlockDc(dc);
   return (Ret);
 }