diff --git a/dlls/kernel/heap.c b/dlls/kernel/heap.c
index a5849ede564..1f1e479e61d 100644
--- a/dlls/kernel/heap.c
+++ b/dlls/kernel/heap.c
@@ -837,16 +837,16 @@ VOID WINAPI GlobalUnfix(HGLOBAL hmem)
  *
  * Get information about a global memory object.
  *
- * NOTES
- *      Should this return GMEM_INVALID_HANDLE on invalid handle?
+ * PARAMS
+ *  hmem [I] Handle of the global memory object 
  *
  * RETURNS
- *      Value specifying allocation flags and lock count
- *      GMEM_INVALID_HANDLE: Failure
+ *  Failure: GMEM_INVALID_HANDLE, when the provided handle is invalid 
+ *  Success: Value specifying allocation flags and lock count
+ *
  */
-UINT WINAPI GlobalFlags(
-              HGLOBAL hmem /* [in] Handle to global memory object */
-) {
+UINT WINAPI GlobalFlags(HGLOBAL hmem)
+{
    DWORD                retval;
    PGLOBAL32_INTERN     pintern;
 
@@ -866,8 +866,9 @@ UINT WINAPI GlobalFlags(
       }
       else
       {
-         WARN("Invalid handle: %p\n", hmem);
-         retval=0;
+         WARN("invalid handle %p (Magic: 0x%04x)\n", hmem, pintern->Magic);
+         SetLastError(ERROR_INVALID_HANDLE);
+         retval = GMEM_INVALID_HANDLE;
       }
       RtlUnlockHeap(GetProcessHeap());
    }
diff --git a/dlls/kernel/tests/heap.c b/dlls/kernel/tests/heap.c
index e1a535cd3d6..fee183096a1 100644
--- a/dlls/kernel/tests/heap.c
+++ b/dlls/kernel/tests/heap.c
@@ -36,6 +36,7 @@ static SIZE_T resize_9x(SIZE_T size)
 START_TEST(heap)
 {
     void *mem;
+    UINT    flags;
     HGLOBAL gbl;
     HGLOBAL hsecond;
     SIZE_T  size;
@@ -86,6 +87,12 @@ START_TEST(heap)
     ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
         "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n",
         hsecond, GetLastError(), gbl);
+    SetLastError(MAGIC_DEAD);
+    flags = GlobalFlags(gbl);
+    ok( (flags == GMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE),
+        "returned 0x%04x with 0x%08lx (expected GMEM_INVALID_HANDLE with " \
+        "ERROR_INVALID_HANDLE)\n", flags, GetLastError());
+
 
     /* Local*() functions */
     gbl = LocalAlloc(LMEM_MOVEABLE, 0);
@@ -109,13 +116,19 @@ START_TEST(heap)
     ok(gbl == NULL, "local realloc allocated memory\n");
 
     /* invalid handles are catched in windows */
-    gbl = LocalAlloc(GMEM_MOVEABLE, 256);
+    gbl = LocalAlloc(LMEM_MOVEABLE, 256);
     LocalFree(gbl);
     SetLastError(MAGIC_DEAD);
     hsecond = LocalFree(gbl);       /* invalid handle: free memory twice */
     ok( (hsecond == gbl) && (GetLastError() == ERROR_INVALID_HANDLE),
         "returned %p with 0x%08lx (expected %p with ERROR_INVALID_HANDLE)\n",
         hsecond, GetLastError(), gbl);
+    SetLastError(MAGIC_DEAD);
+    flags = LocalFlags(gbl);
+    ok( (flags == LMEM_INVALID_HANDLE) && (GetLastError() == ERROR_INVALID_HANDLE),
+        "returned 0x%04x with 0x%08lx (expected LMEM_INVALID_HANDLE with " \
+        "ERROR_INVALID_HANDLE)\n", flags, GetLastError());
+
 
     /* trying to lock empty memory should give an error */
     gbl = GlobalAlloc(GMEM_MOVEABLE|GMEM_ZEROINIT,0);