Merge pull request #191 from MrQwert/master

Minor fixes

Author: mukulhase

webwhatsapi/objects/message.py

@@ -79,7 +79,8 @@ def __init__(self, js_obj, driver=None):
 
         self.size = self._js_obj["size"]
         self.mime = self._js_obj["mimetype"]
-        self.caption = self._js_obj["caption"]
+        if "caption" in self._js_obj and self._js_obj["caption"]:
+            self.caption = self._js_obj["caption"]
 
         self.media_key = self._js_obj.get('mediaKey')
         self.client_url = self._js_obj.get('clientUrl')
@@ -93,6 +94,7 @@ def save_media(self, path):
         ioobj = self.driver.download_media(self)
         with open(filename, "wb") as f:
             f.write(ioobj.getvalue())
+        return filename
 
     def __repr__(self):
         return "<MediaMessage - {type} from {sender} at {timestamp} ({filename})>".format(