diff --git a/apps/avifgainmaputil/convert_command.cc b/apps/avifgainmaputil/convert_command.cc
index c5252b9683..de5a04a2cf 100644
--- a/apps/avifgainmaputil/convert_command.cc
+++ b/apps/avifgainmaputil/convert_command.cc
@@ -79,6 +79,9 @@ avifResult ConvertCommand::Run() {
       depth = image->gainMap->metadata.alternateHdrHeadroomN == 0 ? 8 : 10;
     }
     ImagePtr new_base(avifImageCreateEmpty());
+    if (new_base == nullptr) {
+      return AVIF_RESULT_OUT_OF_MEMORY;
+    }
     const avifResult result =
         ChangeBase(*image, depth, image->yuvFormat, new_base.get());
     if (result != AVIF_RESULT_OK) {
diff --git a/apps/avifgainmaputil/swapbase_command.cc b/apps/avifgainmaputil/swapbase_command.cc
index f7a1ec63a2..2c2e550bdb 100644
--- a/apps/avifgainmaputil/swapbase_command.cc
+++ b/apps/avifgainmaputil/swapbase_command.cc
@@ -162,6 +162,9 @@ avifResult SwapBaseCommand::Run() {
   }
 
   ImagePtr new_base(avifImageCreateEmpty());
+  if (new_base == nullptr) {
+    return AVIF_RESULT_OUT_OF_MEMORY;
+  }
   result = ChangeBase(*image, depth, pixel_format, new_base.get());
   if (result != AVIF_RESULT_OK) {
     return result;