diff --git a/app/Exceptions/DisplayException.php b/app/Exceptions/DisplayException.php
index 387b333d..72fb86c7 100644
--- a/app/Exceptions/DisplayException.php
+++ b/app/Exceptions/DisplayException.php
@@ -10,21 +10,39 @@
 namespace Pterodactyl\Exceptions;
 
 use Log;
+use Throwable;
 
 class DisplayException extends PterodactylException
 {
+    /**
+     * @var string
+     */
+    protected $level;
+
     /**
      * Exception constructor.
      *
-     * @param string $message
-     * @param mixed  $log
+     * @param string         $message
+     * @param Throwable|null $previous
+     * @param string         $level
+     * @internal param mixed $log
      */
-    public function __construct($message, $log = null)
+    public function __construct($message, Throwable $previous = null, $level = 'error')
     {
-        if (! is_null($log)) {
-            Log::error($log);
+        $this->level = $level;
+
+        if (! is_null($previous)) {
+            Log::{$level}($previous);
         }
 
         parent::__construct($message);
     }
+
+    /**
+     * @return string
+     */
+    public function getErrorLevel()
+    {
+        return $this->level;
+    }
 }
diff --git a/app/Services/Servers/StartupModificationService.php b/app/Services/Servers/StartupModificationService.php
index 89d65995..fe29e6ad 100644
--- a/app/Services/Servers/StartupModificationService.php
+++ b/app/Services/Servers/StartupModificationService.php
@@ -9,7 +9,6 @@
 
 namespace Pterodactyl\Services\Servers;
 
-use Illuminate\Log\Writer;
 use Pterodactyl\Models\Server;
 use GuzzleHttp\Exception\RequestException;
 use Illuminate\Database\ConnectionInterface;
@@ -33,7 +32,7 @@ class StartupModificationService
     /**
      * @var \Illuminate\Database\ConnectionInterface
      */
-    protected $database;
+    protected $connection;
 
     /**
      * @var \Pterodactyl\Services\Servers\EnvironmentService
@@ -55,38 +54,30 @@ class StartupModificationService
      */
     protected $validatorService;
 
-    /**
-     * @var \Illuminate\Log\Writer
-     */
-    protected $writer;
-
     /**
      * StartupModificationService constructor.
      *
-     * @param \Illuminate\Database\ConnectionInterface                            $database
+     * @param \Illuminate\Database\ConnectionInterface                            $connection
      * @param \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface  $daemonServerRepository
      * @param \Pterodactyl\Services\Servers\EnvironmentService                    $environmentService
      * @param \Pterodactyl\Contracts\Repository\ServerRepositoryInterface         $repository
      * @param \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface $serverVariableRepository
      * @param \Pterodactyl\Services\Servers\VariableValidatorService              $validatorService
-     * @param \Illuminate\Log\Writer                                              $writer
      */
     public function __construct(
-        ConnectionInterface $database,
+        ConnectionInterface $connection,
         DaemonServerRepositoryInterface $daemonServerRepository,
         EnvironmentService $environmentService,
         ServerRepositoryInterface $repository,
         ServerVariableRepositoryInterface $serverVariableRepository,
-        VariableValidatorService $validatorService,
-        Writer $writer
+        VariableValidatorService $validatorService
     ) {
         $this->daemonServerRepository = $daemonServerRepository;
-        $this->database = $database;
+        $this->connection = $connection;
         $this->environmentService = $environmentService;
         $this->repository = $repository;
         $this->serverVariableRepository = $serverVariableRepository;
         $this->validatorService = $validatorService;
-        $this->writer = $writer;
     }
 
     /**
@@ -126,7 +117,7 @@ class StartupModificationService
             $hasServiceChanges = true;
         }
 
-        $this->database->beginTransaction();
+        $this->connection->beginTransaction();
         if (isset($data['environment'])) {
             $validator = $this->validatorService->isAdmin($this->admin)
                 ->setFields($data['environment'])
@@ -168,14 +159,12 @@ class StartupModificationService
 
         try {
             $this->daemonServerRepository->setNode($server->node_id)->setAccessServer($server->uuid)->update($daemonData);
-            $this->database->commit();
+            $this->connection->commit();
         } catch (RequestException $exception) {
             $response = $exception->getResponse();
-            $this->writer->warning($exception);
-
             throw new DisplayException(trans('admin/server.exceptions.daemon_exception', [
                 'code' => is_null($response) ? 'E_CONN_REFUSED' : $response->getStatusCode(),
-            ]));
+            ]), $exception, 'warning');
         }
     }
 }
diff --git a/tests/Unit/Services/Servers/StartupModificationServiceTest.php b/tests/Unit/Services/Servers/StartupModificationServiceTest.php
new file mode 100644
index 00000000..d35ad551
--- /dev/null
+++ b/tests/Unit/Services/Servers/StartupModificationServiceTest.php
@@ -0,0 +1,95 @@
+<?php
+/*
+ * Pterodactyl - Panel
+ * Copyright (c) 2015 - 2017 Dane Everitt <dane@daneeveritt.com>.
+ *
+ * This software is licensed under the terms of the MIT license.
+ * https://opensource.org/licenses/MIT
+ */
+
+namespace Tests\Unit\Services\Servers;
+
+use Mockery as m;
+use Tests\TestCase;
+use Pterodactyl\Models\Server;
+use Illuminate\Database\ConnectionInterface;
+use Pterodactyl\Services\Servers\EnvironmentService;
+use Pterodactyl\Services\Servers\VariableValidatorService;
+use Pterodactyl\Services\Servers\StartupModificationService;
+use Pterodactyl\Contracts\Repository\ServerRepositoryInterface;
+use Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface;
+use Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface as DaemonServerRepository;
+
+class StartupModificationServiceTest extends TestCase
+{
+    /**
+     * @var \Pterodactyl\Contracts\Repository\Daemon\ServerRepositoryInterface|\Mockery\Mock
+     */
+    protected $daemonServerRepository;
+
+    /**
+     * @var \Illuminate\Database\ConnectionInterface|\Mockery\Mock
+     */
+    protected $connection;
+
+    /**
+     * @var \Pterodactyl\Services\Servers\EnvironmentService|\Mockery\Mock
+     */
+    protected $environmentService;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerRepositoryInterface|\Mockery\Mock
+     */
+    protected $repository;
+
+    /**
+     * @var \Pterodactyl\Contracts\Repository\ServerVariableRepositoryInterface|\Mockery\Mock
+     */
+    protected $serverVariableRepository;
+
+    /**
+     * @var \Pterodactyl\Services\Servers\StartupModificationService
+     */
+    protected $service;
+
+    /**
+     * @var \Pterodactyl\Services\Servers\VariableValidatorService|\Mockery\Mock
+     */
+    protected $validatorService;
+
+    /**
+     * Setup tests.
+     */
+    public function setUp()
+    {
+        parent::setUp();
+
+        $this->daemonServerRepository = m::mock(DaemonServerRepository::class);
+        $this->connection = m::mock(ConnectionInterface::class);
+        $this->environmentService = m::mock(EnvironmentService::class);
+        $this->repository = m::mock(ServerRepositoryInterface::class);
+        $this->serverVariableRepository = m::mock(ServerVariableRepositoryInterface::class);
+        $this->validatorService = m::mock(VariableValidatorService::class);
+
+        $this->service = new StartupModificationService(
+            $this->connection,
+            $this->daemonServerRepository,
+            $this->environmentService,
+            $this->repository,
+            $this->serverVariableRepository,
+            $this->validatorService
+        );
+    }
+
+    /**
+     * Test startup is modified when user is not an administrator.
+     *
+     * @todo this test works, but not for the right reasons...
+     */
+    public function testStartupIsModifiedAsNonAdmin()
+    {
+        $model = factory(Server::class)->make();
+
+        $this->assertTrue(true);
+    }
+}