diff --git a/src/components/portal/Single/Attack.js b/src/components/portal/Single/Attack.js
index a4739a8..9335717 100644
--- a/src/components/portal/Single/Attack.js
+++ b/src/components/portal/Single/Attack.js
@@ -47,13 +47,12 @@ export default class SingleAttack extends React.Component {
         />
       );
     }
-    else {
+    else if (card_data) {
       if (card_data.gsx$splash) {
         return (<Single card={card_data}/>);
       }
-      else {
-        return(<PageNotFound location={this.props.location}/>);
-      }
     }
+
+    return(<PageNotFound location={this.props.location}/>);
   }
 }
diff --git a/src/components/portal/Single/Battlegear.js b/src/components/portal/Single/Battlegear.js
index 95c5507..9d8f3fe 100644
--- a/src/components/portal/Single/Battlegear.js
+++ b/src/components/portal/Single/Battlegear.js
@@ -25,7 +25,6 @@ export default class SingleBattlegear extends React.Component {
     const battlegear = API.portal.battlegear.findOne({'gsx$name': name});
     const card_data = API.cards.battlegear.findOne({'gsx$name': name});
 
-
     if (battlegear) {
       return (<Single 
         card={card_data}
@@ -51,12 +50,8 @@ export default class SingleBattlegear extends React.Component {
       if (card_data.gsx$splash) {
         return (<Single card={card_data}/>);
       }
-      else {
-        return(<PageNotFound location={this.props.location}/>);
-      }
-    }
-    else {
-      return(<PageNotFound location={this.props.location}/>);
     }
+    
+    return(<PageNotFound location={this.props.location}/>);
   }
 }
diff --git a/src/components/portal/Single/Location.js b/src/components/portal/Single/Location.js
index 0a94a15..bf53566 100644
--- a/src/components/portal/Single/Location.js
+++ b/src/components/portal/Single/Location.js
@@ -49,7 +49,7 @@ export default class SingleLocation extends React.Component {
         </React.Fragment>}
       />);
     }
-    else {
+    else if (card_data) {
       if (card_data.gsx$splash) {
         return (<Single 
           card={card_data}
@@ -61,9 +61,8 @@ export default class SingleLocation extends React.Component {
           </React.Fragment>}
         />);
       }
-      else {
-        return(<PageNotFound location={this.props.location}/>);
-      }
     }
+      
+    return(<PageNotFound location={this.props.location}/>);
   }
 }
diff --git a/src/components/portal/Single/Mugic.js b/src/components/portal/Single/Mugic.js
index 8715abb..4a4b400 100644
--- a/src/components/portal/Single/Mugic.js
+++ b/src/components/portal/Single/Mugic.js
@@ -68,7 +68,7 @@ export default class SingleMugic extends React.Component {
         </React.Fragment>}
       />);
     }
-    else {
+    else if (card_data) {
       if (card_data.gsx$splash) {
         return (<Single 
           card={card_data}
@@ -85,9 +85,8 @@ export default class SingleMugic extends React.Component {
           </React.Fragment>}
         />);
       }
-      else {
-        return(<PageNotFound location={this.props.location}/>);
-      }
     }
+    
+    return(<PageNotFound location={this.props.location}/>);
   }
 }