diff --git a/attackcti/attack_api.py b/attackcti/attack_api.py
index a6beeac..90f8ea0 100644
--- a/attackcti/attack_api.py
+++ b/attackcti/attack_api.py
@@ -39,7 +39,6 @@ def parse_stix_objects(self, stix_objects, stix_object_type):
                     'matrix': technique['external_references'][0]['source_name'],
                     'technique': technique['name'],
                     'technique_description': self.try_except(technique, 'description'),
-                    #'tactic': self.handle_list(technique,'kill_chain_phases'),
                     'tactic': self.try_except(technique,'kill_chain_phases'),
                     'technique_id': technique['external_references'][0]['external_id'],
                     'platform': self.try_except(technique,'x_mitre_platforms'),
@@ -97,12 +96,12 @@ def parse_stix_objects(self, stix_objects, stix_object_type):
                 software_dict = {
                     'type': software['type'],
                     'id': software['id'],
-                    'created_by_ref': software['created_by_ref'],
+                    'created_by_ref': self.try_except(software, 'created_by_ref'),
                     'created': str(software['created']),
                     'modified': str(software['modified']),
                     'matrix': software['external_references'][0]['source_name'],
                     'software': software['name'],
-                    'software_description': software['description'],
+                    'software_description': self.try_except(software, 'description'),
                     'software_labels': self.try_except(software, 'labels'),
                     'software_id': software['external_references'][0]['external_id'],
                     'url': software['external_references'][0]['url'],
diff --git a/setup.py b/setup.py
index 441376b..5c271ab 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@
 
 setuptools.setup(
     name="attackcti",
-    version="0.1.6",
+    version="0.1.7",
     author="Roberto Rodriguez",
     author_email="rrodriguezops@gmail.com",
     description="ATTACK CTI Libary",