3 files changed, 6 insertions, 0 deletions
diff --git a/src/resources/db/emotedb.cpp b/src/resources/db/emotedb.cpp
index accea5ae9..eb5eef418 100644
--- a/src/resources/db/emotedb.cpp
+++ b/src/resources/db/emotedb.cpp
@@ -108,6 +108,8 @@ void EmoteDB::loadXmlFile(const std::string &fileName)
             currentInfo = mEmoteInfos[id];
         else
             currentInfo = new EmoteInfo;
+        if (!currentInfo)
+            continue;
         currentInfo->time = XML::getProperty(emoteNode, "time", 500);
         currentInfo->effectId = XML::getProperty(emoteNode, "effect", -1);
 
diff --git a/src/resources/db/horsedb.cpp b/src/resources/db/horsedb.cpp
index 11fd57d36..a3daf76cc 100644
--- a/src/resources/db/horsedb.cpp
+++ b/src/resources/db/horsedb.cpp
@@ -97,6 +97,8 @@ void HorseDB::loadXmlFile(const std::string &fileName)
         else
             currentInfo = new HorseInfo;
 
+        if (!currentInfo)
+            continue;
         currentInfo->offsetX = XML::getProperty(horseNode, "offsetX", 0);
         currentInfo->offsetY = XML::getProperty(horseNode, "offsetY", 0);
 
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index cd615c030..fc1c5fa4f 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -305,6 +305,8 @@ void Image::setAlpha(const float alpha)
             else
             {
                 mSDLSurface = SDLImageHelper::SDLDuplicateSurface(mSDLSurface);
+                if (!mSDLSurface)
+                    return;
             }
         }