diff --git a/src/SDL_hints.c b/src/SDL_hints.c
index 34bd76863..520e4eaa9 100644
--- a/src/SDL_hints.c
+++ b/src/SDL_hints.c
@@ -137,6 +137,10 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
     SDL_DelHintCallback(name, callback, userdata);
 
     entry = (SDL_HintWatch *)SDL_malloc(sizeof(*entry));
+    if (!entry) {
+        SDL_OutOfMemory();
+        return;
+    }
     entry->callback = callback;
     entry->userdata = userdata;
 
@@ -149,6 +153,7 @@ SDL_AddHintCallback(const char *name, SDL_HintCallback callback, void *userdata)
         /* Need to add a hint entry for this watcher */
         hint = (SDL_Hint *)SDL_malloc(sizeof(*hint));
         if (!hint) {
+            SDL_OutOfMemory();
             if(entry)
             {
               SDL_free(entry);