diff --git a/app/Http/Controllers/Admin/NodesController.php b/app/Http/Controllers/Admin/NodesController.php
index 24ac3761..ef77da4e 100644
--- a/app/Http/Controllers/Admin/NodesController.php
+++ b/app/Http/Controllers/Admin/NodesController.php
@@ -253,20 +253,22 @@ class NodesController extends Controller
 
     public function deleteNode(Request $request, $id)
     {
-        $node = Models\Node::findOrFail($id);
-        $servers = Models\Server::where('node', $id)->count();
-        if ($servers > 0) {
-            Alert::danger('You cannot delete a node with servers currently attached to it.')->flash();
-            return redirect()->route('admin.nodes.view', [
-                'id' => $id,
-                'tab' => 'tab_delete'
-            ]);
+        try {
+            $repo = new NodeRepository;
+            $repo->delete($id);
+            Alert::success('Successfully deleted the requested node from the panel.')->flash();
+            return redirect()->route('admin.nodes');
+        } catch (DisplayException $e) {
+            Alert::danger($e->getMessage())->flash();
+        } catch (\Exception $e) {
+            Log::error($e);
+            Alert::danger('An unhandled exception occured while attempting to delete this node. Please try again.')->flash();
         }
 
-        $node->delete();
-        Alert::success('Node successfully deleted.')->flash();
-        return redirect()->route('admin.nodes');
-
+        return redirect()->route('admin.nodes.view', [
+            'id' => $id,
+            'tab' => 'tab_delete'
+        ]);
     }
 
 }
diff --git a/app/Repositories/NodeRepository.php b/app/Repositories/NodeRepository.php
index a23cc745..2d579f27 100644
--- a/app/Repositories/NodeRepository.php
+++ b/app/Repositories/NodeRepository.php
@@ -229,8 +229,30 @@ class NodeRepository {
 
     public function delete($id)
     {
-        // @TODO: add logic;
-        return true;
+        $node = Models\Node::findOrFail($id);
+        if (Models\Server::where('node', $id)->count() > 0) {
+            throw new DisplayException('You cannot delete a node with servers currently attached to it.');
+        }
+
+        DB::beginTransaction();
+
+        try {
+            // Unlink Database Servers
+            Models\DatabaseServer::where('linked_node', $node->id)->update([
+                'linked_node' => null,
+            ]);
+
+            // Delete Allocations
+            Models\Allocation::where('node', $node->id)->delete();
+
+            // Delete Node
+            $node->delete();
+
+            DB::commit();
+        } catch (\Exception $ex) {
+            DB::rollback();
+            throw $ex;
+        }
     }
 
 }