From 1c95b7167ed1f36e4676c1e6f8ea72837c93610c Mon Sep 17 00:00:00 2001
From: Simba Zhang <solderzzc@gmail.com>
Date: Tue, 30 Aug 2016 11:27:24 -0700
Subject: [PATCH 1/2] Fixing clean run issues.

---
 pokemongo_bot/inventory.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pokemongo_bot/inventory.py b/pokemongo_bot/inventory.py
index b09d1c5330..b73531b101 100644
--- a/pokemongo_bot/inventory.py
+++ b/pokemongo_bot/inventory.py
@@ -126,7 +126,7 @@ def exp(self, value):
 
     def refresh(self,inventory):
         self.player_stats = self.retrieve_data(inventory)
-        
+
     def parse(self, item):
         if not item:
             item = {}
@@ -1222,9 +1222,9 @@ def update_web_inventory(self):
 
     def jsonify_inventory(self):
         json_inventory = []
-        
+
         json_inventory.append({"inventory_item_data": {"player_stats": self.player.player_stats}})
-        
+
         for pokedex in self.pokedex.all():
             json_inventory.append({"inventory_item_data": {"pokedex_entry": pokedex}})
 
@@ -1335,11 +1335,18 @@ def refresh_inventory(data=None):
     :return: Nothing.
     :rtype: None
     """
-    _inventory.refresh(data)
+    try:
+        _inventory.refresh(data)
+    except AttributeError:
+        print '_inventory was not initialized'
 
 def jsonify_inventory():
-    return _inventory.jsonify_inventory()
-    
+    try:
+        return _inventory.jsonify_inventory()
+    except AttributeError:
+        print '_inventory was not initialized'
+        return []
+
 def update_web_inventory():
     _inventory.update_web_inventory()
 

From 86fbab2033fd7aaae5491753ea81c2d948bc8bcc Mon Sep 17 00:00:00 2001
From: Simba Zhang <solderzzc@gmail.com>
Date: Tue, 30 Aug 2016 11:27:56 -0700
Subject: [PATCH 2/2] During startup, no bot object.

---
 pokemongo_bot/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pokemongo_bot/__init__.py b/pokemongo_bot/__init__.py
index fb288cfc37..38e440ba59 100644
--- a/pokemongo_bot/__init__.py
+++ b/pokemongo_bot/__init__.py
@@ -1251,7 +1251,7 @@ def heartbeat(self):
                               'level': badgelevel}
                     )
                     human_behaviour.action_delay(3, 10)
-                    
+
             inventory.refresh_inventory()
 
         try:
@@ -1322,7 +1322,7 @@ def _load_recent_forts(self):
                 with open(cached_forts_path) as f:
                     cached_recent_forts = json.load(f)
             except (IOError, ValueError) as e:
-                self.bot.logger.info('[x] Error while opening cached forts: %s' % e, 'red')
+                self.logger.info('[x] Error while opening cached forts: %s' % e, 'red')
                 pass
             except:
                 raise FileIOException("Unexpected error opening {}".cached_forts_path)