From cc7138bbb7561a4ae8f93d4fb2e4cc8673c3783d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bjo=CC=88rn=20Fromme?= <mail@bjo3rn.com>
Date: Sat, 22 Sep 2018 10:45:20 +0200
Subject: [PATCH] Avoid null-pointer exception

---
 .../ext/ep_products/Classes/Controller/HotelController.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/web/typo3conf/ext/ep_products/Classes/Controller/HotelController.php b/web/typo3conf/ext/ep_products/Classes/Controller/HotelController.php
index 3d6077d3..e8fe04d0 100644
--- a/web/typo3conf/ext/ep_products/Classes/Controller/HotelController.php
+++ b/web/typo3conf/ext/ep_products/Classes/Controller/HotelController.php
@@ -84,13 +84,15 @@ class HotelController extends ActionController
      */
     public function detailAction(Hotel $hotel = null)
     {
-        if ($hotel === null) {
+        if ($hotel !== null) {
+            $hotelUid = $hotel->getUid();
+        } else {
             $hotelUid = $this->settings['hotelUid'];
             /** @var Hotel $hotel */
             $hotel = $this->hotelRepository->findByIdentifier($hotelUid);
         }
         $filterSettings = new FilterSettings();
-        $filterSettings->setHotelUid($hotel->getUid());
+        $filterSettings->setHotelUid($hotelUid);
         $excludedConceptUids = GeneralUtility::trimExplode(',', $this->settings['excludedConceptUids'], true);
         $limit = $this->settings['showMoreLink'] ? 4 : 0;
         $teasers = $this->productService->getTeasergroup($filterSettings, $excludedConceptUids, $limit);