From fffbd86a1014ad169ed2d68ea58cdddf346faa14 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 21 Jul 2015 00:47:44 +0300
Subject: Add missing checks and non null attributes.

---
 src/being/being.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/being')

diff --git a/src/being/being.cpp b/src/being/being.cpp
index bf05eb7eb..746cc729b 100644
--- a/src/being/being.cpp
+++ b/src/being/being.cpp
@@ -3611,7 +3611,7 @@ void Being::addItemParticles(const int id, const SpriteDisplay &display)
         pi = (*it).second;
     }
 
-    if (!pi->particles.empty())
+    if (!pi || !pi->particles.empty())
         return;
 
     // setup particle effects
@@ -3735,7 +3735,10 @@ void Being::setRiding(const bool b)
     if (b)
     {
         mHorseInfo = HorseDB::get(1);
-        mHorseSprite = mHorseInfo->sprite;
+        if (mHorseInfo)
+            mHorseSprite = mHorseInfo->sprite;
+        else
+            mHorseSprite = nullptr;
     }
     else
     {
-- 
cgit v1.2.3-60-g2f50