diff --git a/Shadowrun5th/Shadowrun5th.html b/Shadowrun5th/Shadowrun5th.html
index c44f55ace6..1f671646d9 100644
--- a/Shadowrun5th/Shadowrun5th.html
+++ b/Shadowrun5th/Shadowrun5th.html
@@ -10829,13 +10829,13 @@ on("change:chummercheckbox", function(){
                     goodcode=false;
                     error= error + "\n" + "Error with Ware " +err
                 }
-                try{
-                    if(chummerfile.characters.character.armors!=null){
-                        console.log("Importing armors");
-                        if(chummerfile.characters.character.armors.armor.length>1){
-                            for(var i=0;i<chummerfile.characters.character.armors.armor.length;i++){
-                                var newrowid=generateRowID()
 
+                if(chummerfile.characters.character.armors!=null){
+                    console.log("Importing armors");
+                    if(chummerfile.characters.character.armors.armor.length>1){
+                        for(var i=0;i<chummerfile.characters.character.armors.armor.length;i++){
+                            try{
+                                var newrowid=generateRowID()
                                 attributes["repeating_armors_"+newrowid+"_armorname"]=chummerfile.characters.character.armors.armor[i].name;
                                 attributes["repeating_armors_"+newrowid+"_armorrating"]=chummerfile.characters.character.armors.armor[i].armor;
                                 attributes["repeating_armors_"+newrowid+"_armornotes"]="";
@@ -10863,11 +10863,15 @@ on("change:chummercheckbox", function(){
                                         }
                                     }else{
                                         attributes["repeating_armors_"+newrowid+"_armornotes"]+=chummerfile.characters.character.armors.armor[i].gears.gear.name+"\n";
-
                                     }
                                 }
+                            }catch(err){
+                                goodcode=false;
+                                error= error + "\n" + "Error with Armor " + chummerfile.characters.character.armors.armor[i].name + ": " + err
                             }
-                        }else{
+                        }
+                    }else{
+                        try{
                             var newrowid=generateRowID()
                             attributes["repeating_armors_"+newrowid+"_armorname"]=chummerfile.characters.character.armors.armor.name;
                             attributes["repeating_armors_"+newrowid+"_armorrating"]=chummerfile.characters.character.armors.armor.armor;
@@ -10899,13 +10903,14 @@ on("change:chummercheckbox", function(){
 
                                 }
                             }
+                        }catch(err){
+                            goodcode=false;
+                            error= error + "\n" + "Error with Armor " + chummerfile.characters.character.armors.armor.name + ": " + err
                         }
                     }
-                }catch(err){
-                    goodcode=false;
-                    error= error + "\n" + "Error with Armor " +err
                 }
-                try{
+
+                if(chummerfile.characters.character.weapons!=null){
                     console.log("Importing weapons");
                     for(var i=1; i<9; i++){
                         attributes["weaponismelee"+i] = "on";
@@ -10921,20 +10926,20 @@ on("change:chummercheckbox", function(){
                         attributes["weaponmode"+i] = "11";
                         attributes["weaponnotes"+i] = "";
                     }
-                    if(chummerfile.characters.character.weapons!=null){
-                        ammunition = [];
-                        if(chummerfile.characters.character.gears != null) {
-                            for( var j = 0; j < chummerfile.characters.character.gears.gear.length; j++) {
-                                if(chummerfile.characters.character.gears.gear[j].category_english == "Ammunition" ||
-                                    chummerfile.characters.character.gears.gear[j].name_english == "Micro Flares"
-                                ){
-                                    ammunition.push(chummerfile.characters.character.gears.gear[j]);
-                                }
+                    ammunition = [];
+                    if(chummerfile.characters.character.gears != null) {
+                        for( var j = 0; j < chummerfile.characters.character.gears.gear.length; j++) {
+                            if(chummerfile.characters.character.gears.gear[j].category_english == "Ammunition" ||
+                                chummerfile.characters.character.gears.gear[j].name_english == "Micro Flares"
+                            ){
+                                ammunition.push(chummerfile.characters.character.gears.gear[j]);
                             }
                         }
+                    }
 
-                        if(chummerfile.characters.character.weapons.weapon.length>1){
-                            for(var i=1;i<chummerfile.characters.character.weapons.weapon.length+1 && i<9; i++){
+                    if(chummerfile.characters.character.weapons.weapon.length>1){
+                        for(var i=1;i<chummerfile.characters.character.weapons.weapon.length+1 && i<9; i++){
+                            try{
                                 if(chummerfile.characters.character.weapons.weapon[i-1].category!="Gear"){
                                     if(chummerfile.characters.character.weapons.weapon[i-1].type=="Ranged"){
                                         attributes["weaponismelee"+i]=0;
@@ -11040,7 +11045,13 @@ on("change:chummercheckbox", function(){
                                     }
                                 }
                             }
-                        }else{
+                            catch(err) {
+                                goodcode=false;
+                                error= error + "\n" + "Error with Weapon " + chummerfile.characters.character.weapons.weapon[i-1].name + ": " +err
+                            }
+                        }
+                    }else{
+                        try{
                             if(chummerfile.characters.character.weapons.weapon.category!="Gear"){
                                 if(chummerfile.characters.character.weapons.weapon.type=="Ranged"){
                                     attributes["weaponismelee1"]=0;
@@ -11139,11 +11150,13 @@ on("change:chummercheckbox", function(){
                                     }
                             }
                         }
+                        catch(err) {
+                                goodcode=false;
+                                error= error + "\n" + "Error with Weapon " + chummerfile.characters.character.weapons.weapon.name + ": " +err
+                        }
                     }
-                }catch(err){
-                    goodcode=false;
-                    error= error + "\n" + "Error with Weapons " +err
                 }
+
                 try{
                     if(chummerfile.characters.character.complexforms!=null){
                         console.log("Importing complexforms");