diff --git a/app/Http/Controllers/ZoneController.php b/app/Http/Controllers/ZoneController.php
index 09336ed..81ef762 100644
--- a/app/Http/Controllers/ZoneController.php
+++ b/app/Http/Controllers/ZoneController.php
@@ -10,7 +10,7 @@ use App\Models\{Address,Zone};
 class ZoneController extends Controller
 {
 	/**
-	 * Add or edit a node
+	 * Add or edit a zone
 	 */
 	public function add_edit(Request $request,Zone $o)
 	{
diff --git a/app/Http/Requests/DomainRequest.php b/app/Http/Requests/DomainRequest.php
index 8b64fe5..cf7a81a 100644
--- a/app/Http/Requests/DomainRequest.php
+++ b/app/Http/Requests/DomainRequest.php
@@ -24,8 +24,25 @@ class DomainRequest extends FormRequest
 		$o = $this->route('o');
 
 		return [
-			'name' => 'required|max:8|regex:/^[a-z-_~]{1,8}$/|unique:domains,name,'.($o->exists ? $o->id : 0),
-			'dnsdomain' => 'nullable|regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i|unique:domains,dnsdomain,'.($o->exists ? $o->id : NULL),
+			'name' => [
+				'required',
+				'max:8',
+				'regex:/^[a-z-_~]{1,8}$/',
+				Rule::unique('domains')
+					->where(fn($query)=>$query
+						->where('name',$request->post('name'))
+						->when($o?->exists,fn($query)=>$query->where('id','<>',$o->id))
+					)
+			],
+			'dnsdomain' => [
+				'nullable',
+				'regex:/^(?!:\/\/)(?=.{1,255}$)((.{1,63}\.){1,127}(?![0-9]*$)[a-z0-9-]+\.?)$/i',
+				Rule::unique('domains')
+					->where(fn($query)=>$query
+						->where('dnsdomain',$request->post('dnsdomain'))
+						->when($o?->exists,fn($query)=>$query->where('id','<>',$o->id))
+					)
+			],
 			'active' => 'required|boolean',
 			'public' => 'required|boolean',
 			'accept_app' => 'required|boolean',
@@ -33,7 +50,7 @@ class DomainRequest extends FormRequest
 			'nodestatus_id' => [
 				'nullable',
 				Rule::exists(Echoarea::class,'id'),
-				Rule::in($o->echoareas->pluck('id')),
+				Rule::in($o?->echoareas->pluck('id')),
 			]
 		];
 	}
diff --git a/app/Http/Requests/SystemRegisterRequest.php b/app/Http/Requests/SystemRegisterRequest.php
index 6577f07..9175ad5 100644
--- a/app/Http/Requests/SystemRegisterRequest.php
+++ b/app/Http/Requests/SystemRegisterRequest.php
@@ -8,12 +8,10 @@ use Illuminate\Support\Facades\Gate;
 use Illuminate\Validation\Rule;
 
 use App\Classes\FTN\Packet;
-use App\Models\{Setup,System};
+use App\Models\Setup;
 
 class SystemRegisterRequest extends FormRequest
 {
-	private System $so;
-
 	/**
 	 * Determine if the user is authorized to make this request.
 	 *
diff --git a/app/Models/Domain.php b/app/Models/Domain.php
index 19d3334..260a399 100644
--- a/app/Models/Domain.php
+++ b/app/Models/Domain.php
@@ -69,7 +69,8 @@ class Domain extends Model
 
 	public function getCanAcceptAppAttribute(): bool
 	{
-		return our_address($this)->count()
+		return ($x=our_address($this))
+			&& $x->count()
 			&& $this->active
 			&& $this->accept_app
 			&& Auth::id()
diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php
index ef37a55..3478c0e 100644
--- a/resources/views/domain/addedit.blade.php
+++ b/resources/views/domain/addedit.blade.php
@@ -47,7 +47,7 @@ use App\Models\Echoarea;
 						</div>
 
 						<div class="col-2">
-							@if ($o->zones->count() > 1)
+							@if ($o->zones?->count() > 1)
 								<label class="form-label">Flatten Zones <i class="bi bi-info-circle" title="Treat this domain as a 2D domain"></i></label>
 								<div class="input-group">
 									<div class="btn-group" role="group">