diff --git a/web/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php b/web/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php
index 1fd5aae4..bdb51857 100644
--- a/web/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php
+++ b/web/typo3conf/ext/ep_products/Classes/Controller/ResellerController.php
@@ -63,9 +63,13 @@ class ResellerController extends ActionController
     /**
      * @param Reseller $reseller
      */
-    public function listAction(Reseller $reseller)
+    public function listAction(Reseller $reseller = null)
     {
-        $products = $reseller->getProducts();
+        $products = [];
+
+        if ($reseller !== null) {
+            $products = $reseller->getProducts();
+        }
 
         $this->view->assign('reseller', $reseller);
         $this->view->assign('products', $products);
diff --git a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/List.html b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/List.html
index 43489749..0aa6bd76 100644
--- a/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/List.html
+++ b/web/typo3conf/ext/ep_theme/Resources/Private/Templates/Reseller/List.html
@@ -8,14 +8,16 @@
         <div class="container">
             <div class="row">
                 <div class="col-xs-12">
-                    <h2>Gesamtexport XML</h2>
-                    <f:link.action arguments="{reseller: reseller}" pageType="1972" target="_blank">Export XML</f:link.action>
-                    <h2>Einzelexport Excel</h2>
-                    <ul>
-                        <f:for each="{products}" as="product">
-                            <li><f:link.action arguments="{product: product, reseller: reseller}" pageType="1984">Export XLS: {product.name}</f:link.action></li>
-                        </f:for>
-                    </ul>
+                    <f:if condition="{reseller}">
+                        <h2>Gesamtexport XML</h2>
+                        <f:link.action arguments="{reseller: reseller}" pageType="1972" target="_blank">Export XML</f:link.action>
+                        <h2>Einzelexport Excel</h2>
+                        <ul>
+                            <f:for each="{products}" as="product">
+                                <li><f:link.action arguments="{product: product, reseller: reseller}" pageType="1984">Export XLS: {product.name}</f:link.action></li>
+                            </f:for>
+                        </ul>
+                    </f:if>
                 </div>
             </div>
         </div>