diff --git a/src/SDL_internal.h b/src/SDL_internal.h
index a345252f3a..8fcd96a7fa 100644
--- a/src/SDL_internal.h
+++ b/src/SDL_internal.h
@@ -265,6 +265,12 @@ extern "C" {
 #include "SDL_utils_c.h"
 #include "SDL_hashtable.h"
 
+#define PUSH_SDL_ERROR() \
+    { char *_error = SDL_strdup(SDL_GetError());
+
+#define POP_SDL_ERROR() \
+    SDL_SetError("%s", _error); SDL_free(_error); }
+
 // Do any initialization that needs to happen before threads are started
 extern void SDL_InitMainThread(void);
 
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index d3774788fc..db38a19d0d 100644
--- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c
@@ -2513,7 +2513,9 @@ SDL_Window *SDL_CreateWindowWithProperties(SDL_PropertiesID props)
     SDL_UpdateWindowHierarchy(window, parent);
 
     if (_this->CreateSDLWindow && !_this->CreateSDLWindow(_this, window, props)) {
+        PUSH_SDL_ERROR()
         SDL_DestroyWindow(window);
+        POP_SDL_ERROR()
         return NULL;
     }