diff --git a/resources/views/system/addedit.blade.php b/resources/views/system/addedit.blade.php
index 1ff1f8d..f8beed0 100644
--- a/resources/views/system/addedit.blade.php
+++ b/resources/views/system/addedit.blade.php
@@ -258,8 +258,12 @@ use App\Models\Address;
 
 					<div id="collapse_echoarea" class="accordion-collapse collapse {{ ($flash=='echoarea') ? 'show' : '' }}" aria-labelledby="echoarea" data-bs-parent="#accordion_homepage">
 						<div class="accordion-body">
-							<p>This system can subscribe to the following echoareas:</p>
-							@include('system.widget.form-echoarea')
+							@if ($o->sessions->count())
+								<p>This system can subscribe to the following echoareas:</p>
+								@include('system.widget.form-echoarea')
+							@else
+								<p>No session details exist for this system, so Echoareas are unavailable.</p>
+							@endif
 						</div>
 					</div>
 				</div>
@@ -272,8 +276,12 @@ use App\Models\Address;
 
 					<div id="collapse_filearea" class="accordion-collapse collapse {{ ($flash=='filearea') ? 'show' : '' }}" aria-labelledby="filearea" data-bs-parent="#accordion_homepage">
 						<div class="accordion-body">
-							<p>This system can subscribe to the following fileareas:</p>
-							@include('system.widget.form-filearea')
+							@if ($o->sessions->count())
+								<p>This system can subscribe to the following fileareas:</p>
+								@include('system.widget.form-filearea')
+							@else
+								<p>No session details exist for this system, so Fileareas are unavailable.</p>
+							@endif
 						</div>
 					</div>
 				</div>
diff --git a/resources/views/system/widget/echoarea.blade.php b/resources/views/system/widget/echoarea.blade.php
index 264ba28..93d8939 100644
--- a/resources/views/system/widget/echoarea.blade.php
+++ b/resources/views/system/widget/echoarea.blade.php
@@ -1,24 +1,28 @@
 <div class="row">
 	<div class="col-12">
-		<table class="table monotable" id="echoareas">
-			<thead>
-			<tr>
-				<th>Subscribed</th>
-				<th>Echoarea</th>
-				<th>Description</th>
-			</tr>
-			</thead>
-
-			<tbody>
-			@foreach ($echoareas as $oo)
+		@if($echoareas->count())
+			<table class="table monotable" id="echoareas">
+				<thead>
 				<tr>
-					<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
-					<td>{{ $oo->name }}</td>
-					<td>{{ $oo->description }}</td>
+					<th>Subscribed</th>
+					<th>Echoarea</th>
+					<th>Description</th>
 				</tr>
-			@endforeach
-			</tbody>
-		</table>
+				</thead>
+
+				<tbody>
+				@foreach ($echoareas as $oo)
+					<tr>
+						<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->echoareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
+						<td>{{ $oo->name }}</td>
+						<td>{{ $oo->description }}</td>
+					</tr>
+				@endforeach
+				</tbody>
+			</table>
+		@else
+			<p>No echoareas available for this sytem. Check node security and/or echoarea security.</p>
+		@endif
 	</div>
 </div>
 
diff --git a/resources/views/system/widget/filearea.blade.php b/resources/views/system/widget/filearea.blade.php
index c7c2002..571a942 100644
--- a/resources/views/system/widget/filearea.blade.php
+++ b/resources/views/system/widget/filearea.blade.php
@@ -1,24 +1,28 @@
 <div class="row">
 	<div class="col-12">
-		<table class="table monotable" id="fileareas">
-			<thead>
-			<tr>
-				<th>Subscribed</th>
-				<th>Filearea</th>
-				<th>Description</th>
-			</tr>
-			</thead>
-
-			<tbody>
-			@foreach ($fileareas as $oo)
+		@if($fileareas->count())
+			<table class="table monotable" id="fileareas">
+				<thead>
 				<tr>
-					<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
-					<td>{{ $oo->name }}</td>
-					<td>{{ $oo->description }}</td>
+					<th>Subscribed</th>
+					<th>Filearea</th>
+					<th>Description</th>
 				</tr>
-			@endforeach
-			</tbody>
-		</table>
+				</thead>
+
+				<tbody>
+				@foreach ($fileareas as $oo)
+					<tr>
+						<td><input type="checkbox" name="id[]" value="{{ $oo->id }}" @if($ao->fileareas->search(function($item) use ($oo) { return $item->id === $oo->id; }) !== FALSE)checked @endif></td>
+						<td>{{ $oo->name }}</td>
+						<td>{{ $oo->description }}</td>
+					</tr>
+				@endforeach
+				</tbody>
+			</table>
+		@else
+			<p>No fileareas available for this sytem. Check node security and/or filearea security.</p>
+		@endif
 	</div>
 </div>