diff --git a/app/Http/Controllers/MoonsController.php b/app/Http/Controllers/MoonsController.php
index 3fc2d35d5..37d956098 100644
--- a/app/Http/Controllers/MoonsController.php
+++ b/app/Http/Controllers/MoonsController.php
@@ -15,8 +15,7 @@ class MoonsController extends Controller
     public function displayMoons() {
         $moons = DB::table('moons')->get();
         
-        //return view('moons.moon')->with('moons', $moons);
-        return view('moons.moon', compact('moons'));
+        return view('moons.moon')->with($moons);
     }
 
     public function addMoon() {
diff --git a/resources/views/moons/moon.blade.php b/resources/views/moons/moon.blade.php
index e0a1bf5c9..788c0031d 100644
--- a/resources/views/moons/moon.blade.php
+++ b/resources/views/moons/moon.blade.php
@@ -20,6 +20,7 @@
                 <th>Rental End</th>
             </thead>
             <tbody>
+                @if(sizeof($moons) > 0)
                 @foreach ($moons as $moon)
                     <tr>
                         <td>{{ $moon->system }}</td>
@@ -36,6 +37,7 @@
                         <td>{{ $moon->rentend }}</td>
                     </tr>
                 @endforeach
+                @endif
             </tbody>
         </table>
     </div>