diff --git a/components/contentselector/view/contentselector.cpp b/components/contentselector/view/contentselector.cpp
index c8085937c..643d93a9d 100644
--- a/components/contentselector/view/contentselector.cpp
+++ b/components/contentselector/view/contentselector.cpp
@@ -64,29 +64,17 @@ void ContentSelectorView::ContentSelector::buildAddonView()
 void ContentSelectorView::ContentSelector::setProfileContent(const QStringList &fileList)
 {
     clearCheckStates();
-    bool foundGamefile = false;
 
     foreach (const QString &filepath, fileList)
     {
-        if (!foundGamefile)
+        const ContentSelectorModel::EsmFile *file = mContentModel->item(filepath);
+        if (file && file->isGameFile())
         {
-            const ContentSelectorModel::EsmFile *file = mContentModel->item(filepath);
-
-            foundGamefile = (file->isGameFile());
-
-            if (foundGamefile)
-            {
-                setGameFile (filepath);
-                break;
-            }
+            setGameFile (filepath);
+            break;
         }
     }
 
-/*        if (!foundGameFile)
-        {
-            //throw gamefile error here.
-        }*/
-
     setCheckStates (fileList);
 }