diff --git a/.github/workflows/laravel.yml b/.github/workflows/laravel.yml
new file mode 100644
index 0000000000..b98777ec1b
--- /dev/null
+++ b/.github/workflows/laravel.yml
@@ -0,0 +1,42 @@
+name: Laravel-Tests
+
+on:
+  push:
+    branches:
+      - '**'
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  laravel-tests:
+
+    runs-on: ubuntu-latest
+
+    services:
+      mysql:
+          image: mysql:5.7
+          env:
+              MYSQL_ALLOW_EMPTY_PASSWORD: yes
+              MYSQL_DATABASE: lorekeeper_test
+          ports:
+              - 3306
+          options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+    steps:
+    - uses: shivammathur/setup-php@15c43e89cdef867065b0213be354c2841860869e
+      with:
+        php-version: '7.4'
+    - uses: actions/checkout@v2
+    - name: Copy .env
+      run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+    - name: Install Dependencies
+      run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
+    - name: Generate key
+      run: php artisan key:generate
+    - name: Directory Permissions
+      run: chmod -R 777 storage bootstrap/cache
+    - name: Execute tests (Unit and Feature tests) via PHPUnit
+      run: php artisan test
+      env:
+        DB_PORT: ${{ job.services.mysql.ports[3306] }}
diff --git a/.gitignore b/.gitignore
index bafc0dea2e..e9099d7c95 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ npm-debug.log
 yarn-error.log
 *.env
 /composer.phar
+*.env.testing
 *.cache
diff --git a/app/Http/Controllers/Admin/Characters/CharacterController.php b/app/Http/Controllers/Admin/Characters/CharacterController.php
index d9f826e7e4..73282e3021 100644
--- a/app/Http/Controllers/Admin/Characters/CharacterController.php
+++ b/app/Http/Controllers/Admin/Characters/CharacterController.php
@@ -113,7 +113,7 @@ public function postCreateCharacter(Request $request, CharacterManager $service)
             return redirect()->to($character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -145,7 +145,7 @@ public function postCreateMyo(Request $request, CharacterManager $service) {
             return redirect()->to($character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -219,7 +219,7 @@ public function postEditCharacterStats(Request $request, CharacterManager $servi
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -251,7 +251,7 @@ public function postEditMyoStats(Request $request, CharacterManager $service, $i
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -318,7 +318,7 @@ public function postEditCharacterDescription(Request $request, CharacterManager
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -347,7 +347,7 @@ public function postEditMyoDescription(Request $request, CharacterManager $servi
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -376,7 +376,7 @@ public function postCharacterSettings(Request $request, CharacterManager $servic
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -405,7 +405,7 @@ public function postMyoSettings(Request $request, CharacterManager $service, $id
             return redirect()->to($this->character->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -470,7 +470,7 @@ public function postCharacterDelete(Request $request, CharacterManager $service,
             return redirect()->to('masterlist');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -497,7 +497,7 @@ public function postMyoDelete(Request $request, CharacterManager $service, $id)
             return redirect()->to('myos');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -522,7 +522,7 @@ public function postTransfer(Request $request, CharacterManager $service, $slug)
             flash('Character transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -547,7 +547,7 @@ public function postMyoTransfer(Request $request, CharacterManager $service, $id
             flash('Character transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -630,7 +630,7 @@ public function postTransferQueue(Request $request, CharacterManager $service, $
             }
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -728,7 +728,7 @@ public function postTradeQueue(Request $request, TradeManager $service, $id) {
             flash('Trade rejected.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Characters/CharacterImageController.php b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
index 042ed65a66..ebdd4cae06 100644
--- a/app/Http/Controllers/Admin/Characters/CharacterImageController.php
+++ b/app/Http/Controllers/Admin/Characters/CharacterImageController.php
@@ -82,7 +82,7 @@ public function postNewImage(Request $request, CharacterManager $service, $slug)
             flash('Image uploaded successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back()->withInput();
@@ -128,7 +128,7 @@ public function postEditImageFeatures(Request $request, CharacterManager $servic
             flash('Character traits edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -181,7 +181,7 @@ public function postEditImageNotes(Request $request, CharacterManager $service,
             flash('Image notes edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -220,7 +220,7 @@ public function postEditImageCredits(Request $request, CharacterManager $service
             flash('Image credits edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -258,7 +258,7 @@ public function postImageReupload(Request $request, CharacterManager $service, $
             flash('Image uploaded successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -283,7 +283,7 @@ public function postImageSettings(Request $request, CharacterManager $service, $
             flash('Image settings edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -320,7 +320,7 @@ public function postImageActive(Request $request, CharacterManager $service, $id
             flash('Active character image set successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -357,7 +357,7 @@ public function postImageDelete(Request $request, CharacterManager $service, $id
             flash('Character image deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -384,7 +384,7 @@ public function postSortImages(Request $request, CharacterManager $service, $slu
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Characters/GrantController.php b/app/Http/Controllers/Admin/Characters/GrantController.php
index 11e3360305..8a31b31105 100644
--- a/app/Http/Controllers/Admin/Characters/GrantController.php
+++ b/app/Http/Controllers/Admin/Characters/GrantController.php
@@ -25,7 +25,7 @@ public function postCharacterCurrency($slug, Request $request, CurrencyManager $
             flash('Currency granted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -46,7 +46,7 @@ public function postCharacterItems($slug, Request $request, InventoryManager $se
             flash('Items granted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/CharacterCategoryController.php b/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
index f7a01c833a..97ff09b3ed 100644
--- a/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
+++ b/app/Http/Controllers/Admin/Data/CharacterCategoryController.php
@@ -82,7 +82,7 @@ public function postCreateEditCharacterCategory(Request $request, CharacterCateg
             return redirect()->to('admin/data/character-categories/edit/'.$category->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -117,7 +117,7 @@ public function postDeleteCharacterCategory(Request $request, CharacterCategoryS
             flash('Category deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -136,7 +136,7 @@ public function postSortCharacterCategory(Request $request, CharacterCategorySer
             flash('Category order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/CurrencyController.php b/app/Http/Controllers/Admin/Data/CurrencyController.php
index 08c093da76..1e83470676 100644
--- a/app/Http/Controllers/Admin/Data/CurrencyController.php
+++ b/app/Http/Controllers/Admin/Data/CurrencyController.php
@@ -82,7 +82,7 @@ public function postCreateEditCurrency(Request $request, CurrencyService $servic
             return redirect()->to('admin/data/currencies/edit/'.$currency->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -117,7 +117,7 @@ public function postDeleteCurrency(Request $request, CurrencyService $service, $
             flash('Currency deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -149,7 +149,7 @@ public function postSortCurrency(Request $request, CurrencyService $service, $ty
             flash('Currency order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/FeatureController.php b/app/Http/Controllers/Admin/Data/FeatureController.php
index 853981ae6a..3ecb45fcae 100644
--- a/app/Http/Controllers/Admin/Data/FeatureController.php
+++ b/app/Http/Controllers/Admin/Data/FeatureController.php
@@ -90,7 +90,7 @@ public function postCreateEditFeatureCategory(Request $request, FeatureService $
             return redirect()->to('admin/data/trait-categories/edit/'.$category->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -125,7 +125,7 @@ public function postDeleteFeatureCategory(Request $request, FeatureService $serv
             flash('Category deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -144,7 +144,7 @@ public function postSortFeatureCategory(Request $request, FeatureService $servic
             flash('Category order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -248,7 +248,7 @@ public function postCreateEditFeature(Request $request, FeatureService $service,
             return redirect()->to('admin/data/traits/edit/'.$feature->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -283,7 +283,7 @@ public function postDeleteFeature(Request $request, FeatureService $service, $id
             flash('Trait deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/GalleryController.php b/app/Http/Controllers/Admin/Data/GalleryController.php
index 55688f5d92..a44be70add 100644
--- a/app/Http/Controllers/Admin/Data/GalleryController.php
+++ b/app/Http/Controllers/Admin/Data/GalleryController.php
@@ -81,7 +81,7 @@ public function postCreateEditGallery(Request $request, GalleryService $service,
             return redirect()->to('admin/data/galleries/edit/'.$gallery->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -116,7 +116,7 @@ public function postDeleteGallery(Request $request, GalleryService $service, $id
             flash('Gallery deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/ItemController.php b/app/Http/Controllers/Admin/Data/ItemController.php
index dcad9d0ada..05d7ce1c21 100644
--- a/app/Http/Controllers/Admin/Data/ItemController.php
+++ b/app/Http/Controllers/Admin/Data/ItemController.php
@@ -91,7 +91,7 @@ public function postCreateEditItemCategory(Request $request, ItemService $servic
             return redirect()->to('admin/data/item-categories/edit/'.$category->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -126,7 +126,7 @@ public function postDeleteItemCategory(Request $request, ItemService $service, $
             flash('Category deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -145,7 +145,7 @@ public function postSortItemCategory(Request $request, ItemService $service) {
             flash('Category order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -240,7 +240,7 @@ public function postCreateEditItem(Request $request, ItemService $service, $id =
             return redirect()->to('admin/data/items/edit/'.$item->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -275,7 +275,7 @@ public function postDeleteItem(Request $request, ItemService $service, $id) {
             flash('Item deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -322,7 +322,7 @@ public function postAddItemTag(Request $request, ItemService $service, $id) {
             return redirect()->to($tag->adminUrl);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -365,7 +365,7 @@ public function postEditItemTag(Request $request, ItemService $service, $id, $ta
             flash('Tag edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -405,7 +405,7 @@ public function postDeleteItemTag(Request $request, ItemService $service, $id, $
             flash('Tag deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/LootTableController.php b/app/Http/Controllers/Admin/Data/LootTableController.php
index 592d99bd07..733185affe 100644
--- a/app/Http/Controllers/Admin/Data/LootTableController.php
+++ b/app/Http/Controllers/Admin/Data/LootTableController.php
@@ -98,7 +98,7 @@ public function postCreateEditLootTable(Request $request, LootService $service,
             return redirect()->to('admin/data/loot-tables/edit/'.$table->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -133,7 +133,7 @@ public function postDeleteLootTable(Request $request, LootService $service, $id)
             flash('Loot table deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/PromptController.php b/app/Http/Controllers/Admin/Data/PromptController.php
index bae83fd551..02b9deb072 100644
--- a/app/Http/Controllers/Admin/Data/PromptController.php
+++ b/app/Http/Controllers/Admin/Data/PromptController.php
@@ -80,7 +80,7 @@ public function postCreateEditPromptCategory(Request $request, PromptService $se
             return redirect()->to('admin/data/prompt-categories/edit/'.$category->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -115,7 +115,7 @@ public function postDeletePromptCategory(Request $request, PromptService $servic
             flash('Category deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -134,7 +134,7 @@ public function postSortPromptCategory(Request $request, PromptService $service)
             flash('Category order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -220,7 +220,7 @@ public function postCreateEditPrompt(Request $request, PromptService $service, $
             return redirect()->to('admin/data/prompts/edit/'.$prompt->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -255,7 +255,7 @@ public function postDeletePrompt(Request $request, PromptService $service, $id)
             flash('Prompt deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/RarityController.php b/app/Http/Controllers/Admin/Data/RarityController.php
index 2af60445ed..45c2ee9668 100644
--- a/app/Http/Controllers/Admin/Data/RarityController.php
+++ b/app/Http/Controllers/Admin/Data/RarityController.php
@@ -79,7 +79,7 @@ public function postCreateEditRarity(Request $request, RarityService $service, $
             return redirect()->to('admin/data/rarities/edit/'.$rarity->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -114,7 +114,7 @@ public function postDeleteRarity(Request $request, RarityService $service, $id)
             flash('Rarity deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -133,7 +133,7 @@ public function postSortRarity(Request $request, RarityService $service) {
             flash('Rarity order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/ShopController.php b/app/Http/Controllers/Admin/Data/ShopController.php
index 2f709d826e..a9a88c5e94 100644
--- a/app/Http/Controllers/Admin/Data/ShopController.php
+++ b/app/Http/Controllers/Admin/Data/ShopController.php
@@ -83,7 +83,7 @@ public function postCreateEditShop(Request $request, ShopService $service, $id =
             return redirect()->to('admin/data/shops/edit/'.$shop->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -108,7 +108,7 @@ public function postEditShopStock(Request $request, ShopService $service, $id) {
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -143,7 +143,7 @@ public function postDeleteShop(Request $request, ShopService $service, $id) {
             flash('Shop deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -162,7 +162,7 @@ public function postSortShop(Request $request, ShopService $service) {
             flash('Shop order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/SpeciesController.php b/app/Http/Controllers/Admin/Data/SpeciesController.php
index b532e59d5e..95e768ebfa 100644
--- a/app/Http/Controllers/Admin/Data/SpeciesController.php
+++ b/app/Http/Controllers/Admin/Data/SpeciesController.php
@@ -83,7 +83,7 @@ public function postCreateEditSpecies(Request $request, SpeciesService $service,
             return redirect()->to('admin/data/species/edit/'.$species->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -118,7 +118,7 @@ public function postDeleteSpecies(Request $request, SpeciesService $service, $id
             flash('Species deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -137,7 +137,7 @@ public function postSortSpecies(Request $request, SpeciesService $service) {
             flash('Species order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -207,7 +207,7 @@ public function postCreateEditSubtype(Request $request, SpeciesService $service,
             return redirect()->to('admin/data/subtypes/edit/'.$subtype->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -242,7 +242,7 @@ public function postDeleteSubtype(Request $request, SpeciesService $service, $id
             flash('Subtype deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -261,7 +261,7 @@ public function postSortSubtypes(Request $request, SpeciesService $service) {
             flash('Subtype order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Data/SublistController.php b/app/Http/Controllers/Admin/Data/SublistController.php
index dd8d86f407..7926174de7 100644
--- a/app/Http/Controllers/Admin/Data/SublistController.php
+++ b/app/Http/Controllers/Admin/Data/SublistController.php
@@ -95,7 +95,7 @@ public function postCreateEditSublist(Request $request, SublistService $service,
             return redirect()->to('admin/data/sublists/edit/'.$sublist->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -130,7 +130,7 @@ public function postDeleteSublist(Request $request, SublistService $service, $id
             flash('Sublist deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -149,7 +149,7 @@ public function postSortSublist(Request $request, SublistService $service) {
             flash('Category order updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/DesignController.php b/app/Http/Controllers/Admin/DesignController.php
index eb6dd75071..7d8170a0b1 100644
--- a/app/Http/Controllers/Admin/DesignController.php
+++ b/app/Http/Controllers/Admin/DesignController.php
@@ -68,7 +68,7 @@ public function postDesign($id, $action, Request $request, DesignUpdateManager $
             flash('Request rejected successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -95,7 +95,7 @@ public function postVote($id, $action, Request $request, DesignUpdateManager $se
             flash('Voted to approve successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/FileController.php b/app/Http/Controllers/Admin/FileController.php
index 8ca8fd8b51..b50006e18f 100644
--- a/app/Http/Controllers/Admin/FileController.php
+++ b/app/Http/Controllers/Admin/FileController.php
@@ -61,7 +61,7 @@ public function postCreateFolder(Request $request, FileManager $service) {
             flash('Folder created successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -88,7 +88,7 @@ public function postMoveFile(Request $request, FileManager $service) {
             flash('File moved successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -112,7 +112,7 @@ public function postRenameFile(Request $request, FileManager $service) {
             flash('File renamed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -135,7 +135,7 @@ public function postDeleteFile(Request $request, FileManager $service) {
             flash('File deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -183,7 +183,7 @@ public function postRenameFolder(Request $request, FileManager $service) {
             flash('Folder renamed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
@@ -207,7 +207,7 @@ public function postDeleteFolder(Request $request, FileManager $service) {
             flash('Folder deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
@@ -244,7 +244,7 @@ public function postUploadImage(Request $request, FileManager $service) {
             flash('Image uploaded successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -266,7 +266,7 @@ public function postUploadCss(Request $request, FileManager $service) {
             flash('File uploaded successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/GalleryController.php b/app/Http/Controllers/Admin/GalleryController.php
index ae2f7eb390..2e51fcc4dd 100644
--- a/app/Http/Controllers/Admin/GalleryController.php
+++ b/app/Http/Controllers/Admin/GalleryController.php
@@ -123,7 +123,7 @@ private function postVote($id, GalleryManager $service, $action) {
             flash('Voted to approve successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -144,7 +144,7 @@ private function postStaffComments($id, $data, GalleryManager $service) {
             flash('Comments updated succesfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -165,7 +165,7 @@ private function postValue($id, $data, GalleryManager $service) {
             flash('Submission evaluated succesfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/InvitationController.php b/app/Http/Controllers/Admin/InvitationController.php
index efc02b7ae5..5cb7191d1c 100644
--- a/app/Http/Controllers/Admin/InvitationController.php
+++ b/app/Http/Controllers/Admin/InvitationController.php
@@ -31,7 +31,7 @@ public function postGenerateKey(InvitationService $service) {
             flash('Generated invitation successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -52,7 +52,7 @@ public function postDeleteKey(InvitationService $service, $id) {
             flash('Deleted invitation key successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/NewsController.php b/app/Http/Controllers/Admin/NewsController.php
index f1186085ef..b70b997bd8 100644
--- a/app/Http/Controllers/Admin/NewsController.php
+++ b/app/Http/Controllers/Admin/NewsController.php
@@ -70,7 +70,7 @@ public function postCreateEditNews(Request $request, NewsService $service, $id =
             return redirect()->to('admin/news/edit/'.$news->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -105,7 +105,7 @@ public function postDeleteNews(Request $request, NewsService $service, $id) {
             flash('News deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/PageController.php b/app/Http/Controllers/Admin/PageController.php
index e4c215767b..b97b311087 100644
--- a/app/Http/Controllers/Admin/PageController.php
+++ b/app/Http/Controllers/Admin/PageController.php
@@ -70,7 +70,7 @@ public function postCreateEditPage(Request $request, PageService $service, $id =
             return redirect()->to('admin/pages/edit/'.$page->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -105,7 +105,7 @@ public function postDeletePage(Request $request, PageService $service, $id) {
             flash('Page deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/ReportController.php b/app/Http/Controllers/Admin/ReportController.php
index 8e168f53d5..f34d8a62f1 100644
--- a/app/Http/Controllers/Admin/ReportController.php
+++ b/app/Http/Controllers/Admin/ReportController.php
@@ -63,7 +63,7 @@ public function postReport(Request $request, ReportManager $service, $id, $actio
             flash('Report closed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/SalesController.php b/app/Http/Controllers/Admin/SalesController.php
index 78da2d8873..2541349221 100644
--- a/app/Http/Controllers/Admin/SalesController.php
+++ b/app/Http/Controllers/Admin/SalesController.php
@@ -88,7 +88,7 @@ public function postCreateEditSales(Request $request, SalesService $service, $id
             return redirect()->to('admin/sales/edit/'.$sales->id);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -123,7 +123,7 @@ public function postDeleteSales(Request $request, SalesService $service, $id) {
             flash('Sales deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/SubmissionController.php b/app/Http/Controllers/Admin/SubmissionController.php
index 13c60ad728..b04daf34ea 100644
--- a/app/Http/Controllers/Admin/SubmissionController.php
+++ b/app/Http/Controllers/Admin/SubmissionController.php
@@ -154,7 +154,7 @@ public function postSubmission(Request $request, SubmissionManager $service, $id
             flash('Submission approved successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Users/GrantController.php b/app/Http/Controllers/Admin/Users/GrantController.php
index 910054f892..fa5a93a3b6 100644
--- a/app/Http/Controllers/Admin/Users/GrantController.php
+++ b/app/Http/Controllers/Admin/Users/GrantController.php
@@ -43,7 +43,7 @@ public function postUserCurrency(Request $request, CurrencyManager $service) {
             flash('Currency granted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -75,7 +75,7 @@ public function postItems(Request $request, InventoryManager $service) {
             flash('Items granted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Users/RankController.php b/app/Http/Controllers/Admin/Users/RankController.php
index f11d370095..b501c4be10 100644
--- a/app/Http/Controllers/Admin/Users/RankController.php
+++ b/app/Http/Controllers/Admin/Users/RankController.php
@@ -66,7 +66,7 @@ public function postCreateEditRank(Request $request, RankService $service, $id =
             flash('Rank created successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -98,7 +98,7 @@ public function postDeleteRank(Request $request, RankService $service, $id) {
             flash('Rank deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -110,7 +110,7 @@ public function postSortRanks(Request $request, RankService $service) {
             flash('Ranks sorted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Admin/Users/UserController.php b/app/Http/Controllers/Admin/Users/UserController.php
index 1582d56e5e..8c1565e746 100644
--- a/app/Http/Controllers/Admin/Users/UserController.php
+++ b/app/Http/Controllers/Admin/Users/UserController.php
@@ -211,7 +211,7 @@ public function postUserBirthday(Request $request, $name) {
             flash('Birthday updated successfully!')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -287,7 +287,7 @@ public function postBan(Request $request, UserService $service, $name) {
             flash($wasBanned ? 'User ban reason edited successfully.' : 'User banned successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -324,7 +324,7 @@ public function postUnban(Request $request, UserService $service, $name) {
             flash('User unbanned successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -380,7 +380,7 @@ public function postDeactivate(Request $request, UserService $service, $name) {
             flash($wasDeactivated ? 'User deactivation reason edited successfully.' : 'User deactivated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -417,7 +417,7 @@ public function postReactivate(Request $request, UserService $service, $name) {
             flash('User reactivated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index aa2e87fedd..5ed8e03a99 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -92,7 +92,7 @@ public function postRegisterWithDriver(LinkService $service, Request $request, $
             return redirect('/');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
diff --git a/app/Http/Controllers/Characters/CharacterController.php b/app/Http/Controllers/Characters/CharacterController.php
index 69557a256f..1887687841 100644
--- a/app/Http/Controllers/Characters/CharacterController.php
+++ b/app/Http/Controllers/Characters/CharacterController.php
@@ -185,7 +185,7 @@ public function postEditCharacterProfile(Request $request, CharacterManager $ser
             flash('Profile edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -308,7 +308,7 @@ public function postCurrencyTransfer(Request $request, CurrencyManager $service,
             flash('Currency transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -476,7 +476,7 @@ public function postTransfer(Request $request, CharacterManager $service, $slug)
             flash('Transfer created successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -501,7 +501,7 @@ public function postCancelTransfer(Request $request, CharacterManager $service,
             flash('Transfer cancelled.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -546,7 +546,7 @@ public function postCharacterApproval($slug, DesignUpdateManager $service) {
             return redirect()->to($request->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -565,7 +565,7 @@ private function postItemTransfer(Request $request, InventoryManager $service) {
             flash('Item transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -584,7 +584,7 @@ private function postName(Request $request, InventoryManager $service) {
             flash('Item named successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -603,7 +603,7 @@ private function postDelete(Request $request, InventoryManager $service) {
             flash('Item deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Characters/DesignController.php b/app/Http/Controllers/Characters/DesignController.php
index daf098260f..317de7cd5e 100644
--- a/app/Http/Controllers/Characters/DesignController.php
+++ b/app/Http/Controllers/Characters/DesignController.php
@@ -95,7 +95,7 @@ public function postComments(Request $request, DesignUpdateManager $service, $id
             flash('Request edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -144,7 +144,7 @@ public function postImage(Request $request, DesignUpdateManager $service, $id) {
             flash('Request edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -200,7 +200,7 @@ public function postAddons(Request $request, DesignUpdateManager $service, $id)
             flash('Request edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -265,7 +265,7 @@ public function postFeatures(Request $request, DesignUpdateManager $service, $id
             flash('Request edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -311,7 +311,7 @@ public function postSubmit(DesignUpdateManager $service, $id) {
             flash('Request submitted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -357,7 +357,7 @@ public function postDelete(DesignUpdateManager $service, $id) {
             flash('Request deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Characters/MyoController.php b/app/Http/Controllers/Characters/MyoController.php
index 5668455809..22de6adb5a 100644
--- a/app/Http/Controllers/Characters/MyoController.php
+++ b/app/Http/Controllers/Characters/MyoController.php
@@ -124,7 +124,7 @@ public function postEditCharacterProfile(Request $request, CharacterManager $ser
             flash('Profile edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -217,7 +217,7 @@ public function postTransfer(Request $request, CharacterManager $service, $id) {
             flash('Transfer created successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -242,7 +242,7 @@ public function postCancelTransfer(Request $request, CharacterManager $service,
             flash('Transfer cancelled.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -287,7 +287,7 @@ public function postCharacterApproval(DesignUpdateManager $service, $id) {
             return redirect()->to($request->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/GalleryController.php b/app/Http/Controllers/GalleryController.php
index 6106df65a4..1c6d4380ff 100644
--- a/app/Http/Controllers/GalleryController.php
+++ b/app/Http/Controllers/GalleryController.php
@@ -383,7 +383,7 @@ public function postCreateEditGallerySubmission(Request $request, GalleryManager
             return redirect()->to('gallery/submissions/pending');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -403,7 +403,7 @@ public function postArchiveSubmission(Request $request, GalleryManager $service,
             flash('Submission updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -424,7 +424,7 @@ public function postEditCollaborator(Request $request, GalleryManager $service,
             flash('Collaborator info edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -444,7 +444,7 @@ public function postFavoriteSubmission(Request $request, GalleryManager $service
             flash('Favorite updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/HomeController.php b/app/Http/Controllers/HomeController.php
index 8ae0a1e8be..7fbd1a38d0 100644
--- a/app/Http/Controllers/HomeController.php
+++ b/app/Http/Controllers/HomeController.php
@@ -96,7 +96,7 @@ public function getAuthCallback(LinkService $service, $provider) {
             return redirect()->to('account/aliases');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->to(Auth::user()->has_alias ? 'account/aliases' : 'link');
@@ -138,7 +138,7 @@ public function postBirthday(Request $request) {
             return redirect()->to('/');
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
diff --git a/app/Http/Controllers/ShopController.php b/app/Http/Controllers/ShopController.php
index 520039efd5..045f5d08cc 100644
--- a/app/Http/Controllers/ShopController.php
+++ b/app/Http/Controllers/ShopController.php
@@ -115,7 +115,7 @@ public function postBuy(Request $request, ShopManager $service) {
             flash('Successfully purchased item.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/AccountController.php b/app/Http/Controllers/Users/AccountController.php
index 19800b7604..f628ca2e5d 100644
--- a/app/Http/Controllers/Users/AccountController.php
+++ b/app/Http/Controllers/Users/AccountController.php
@@ -81,7 +81,7 @@ public function postAvatar(Request $request, UserService $service) {
             flash('Avatar updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -110,7 +110,7 @@ public function postPassword(Request $request, UserService $service) {
             flash('Password updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -132,7 +132,7 @@ public function postEmail(Request $request, UserService $service) {
             flash('Email updated successfully. A verification email has been sent to your new email address.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -151,7 +151,7 @@ public function postBirthday(Request $request, UserService $service) {
             flash('Setting updated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -240,7 +240,7 @@ public function postMakePrimary(LinkService $service, $id) {
             flash('Your primary alias has been changed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -270,7 +270,7 @@ public function postHideAlias(LinkService $service, $id) {
             flash('Your alias\'s visibility setting has been changed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -300,7 +300,7 @@ public function postRemoveAlias(LinkService $service, $id) {
             flash('Your alias has been removed successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -331,7 +331,7 @@ public function postDeactivate(Request $request, UserService $service) {
             flash($wasDeactivated ? 'Deactivation reason edited successfully.' : 'Your account has successfully been deactivated. We hope to see you again and wish you the best!')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -352,7 +352,7 @@ public function postReactivate(Request $request, UserService $service) {
             flash('You have reactivated successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/BankController.php b/app/Http/Controllers/Users/BankController.php
index 2044f81443..479b57b516 100644
--- a/app/Http/Controllers/Users/BankController.php
+++ b/app/Http/Controllers/Users/BankController.php
@@ -45,7 +45,7 @@ public function postTransfer(Request $request, CurrencyManager $service) {
             flash('Currency transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/BookmarkController.php b/app/Http/Controllers/Users/BookmarkController.php
index 5738807b86..00e225d8dc 100644
--- a/app/Http/Controllers/Users/BookmarkController.php
+++ b/app/Http/Controllers/Users/BookmarkController.php
@@ -131,7 +131,7 @@ public function postCreateEditBookmark(Request $request, BookmarkManager $servic
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -169,7 +169,7 @@ public function postDeleteBookmark(Request $request, BookmarkManager $service, $
             flash('Bookmark deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/CharacterController.php b/app/Http/Controllers/Users/CharacterController.php
index de9f4f3c6e..06a83bdcb8 100644
--- a/app/Http/Controllers/Users/CharacterController.php
+++ b/app/Http/Controllers/Users/CharacterController.php
@@ -61,7 +61,7 @@ public function postSortCharacters(Request $request, CharacterManager $service)
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -124,7 +124,7 @@ public function postHandleTransfer(Request $request, CharacterManager $service,
             }
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/InventoryController.php b/app/Http/Controllers/Users/InventoryController.php
index cd45278b31..7e14781716 100644
--- a/app/Http/Controllers/Users/InventoryController.php
+++ b/app/Http/Controllers/Users/InventoryController.php
@@ -219,7 +219,7 @@ public function postConsolidateInventory(Request $request, InventoryManager $ser
             flash('Inventory consolidated.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -238,7 +238,7 @@ private function postTransfer(Request $request, InventoryManager $service) {
             flash('Item transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -257,7 +257,7 @@ private function postTransferToCharacter(Request $request, InventoryManager $ser
             flash('Item transferred successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -276,7 +276,7 @@ private function postDelete(Request $request, InventoryManager $service) {
             flash('Item deleted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -295,7 +295,7 @@ private function postResell(Request $request, InventoryManager $service) {
             flash('Item sold successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -317,7 +317,7 @@ private function postAct(Request $request) {
             flash('Invalid action selected.')->error();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/ReportController.php b/app/Http/Controllers/Users/ReportController.php
index dc5dd32c59..93ac5a1fb6 100644
--- a/app/Http/Controllers/Users/ReportController.php
+++ b/app/Http/Controllers/Users/ReportController.php
@@ -102,7 +102,7 @@ public function postNewReport(Request $request, ReportManager $service) {
             flash('Report submitted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Http/Controllers/Users/SubmissionController.php b/app/Http/Controllers/Users/SubmissionController.php
index 331ca12d4b..feb5234e1e 100644
--- a/app/Http/Controllers/Users/SubmissionController.php
+++ b/app/Http/Controllers/Users/SubmissionController.php
@@ -151,7 +151,7 @@ public function postNewSubmission(Request $request, SubmissionManager $service)
             flash('Prompt submitted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
@@ -248,7 +248,7 @@ public function postNewClaim(Request $request, SubmissionManager $service) {
             flash('Claim submitted successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
 
             return redirect()->back();
diff --git a/app/Http/Controllers/Users/TradeController.php b/app/Http/Controllers/Users/TradeController.php
index 66b44b3458..c0718fef4b 100644
--- a/app/Http/Controllers/Users/TradeController.php
+++ b/app/Http/Controllers/Users/TradeController.php
@@ -160,7 +160,7 @@ public function postCreateTrade(Request $request, TradeManager $service) {
             return redirect()->to($trade->url);
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -180,7 +180,7 @@ public function postEditTrade(Request $request, TradeManager $service, $id) {
             flash('Trade offer edited successfully.')->success();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -219,7 +219,7 @@ public function postConfirmOffer(Request $request, TradeManager $service, $id) {
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -258,7 +258,7 @@ public function postConfirmTrade(Request $request, TradeManager $service, $id) {
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
@@ -297,7 +297,7 @@ public function postCancelTrade(Request $request, TradeManager $service, $id) {
             return redirect()->back();
         } else {
             foreach ($service->errors()->getMessages()['error'] as $error) {
-                flash($error)->error();
+                $service->addError($error);
             }
         }
 
diff --git a/app/Services/Service.php b/app/Services/Service.php
index 9ccc90b7da..dfb46cb719 100644
--- a/app/Services/Service.php
+++ b/app/Services/Service.php
@@ -9,7 +9,9 @@
 use Config;
 use DB;
 use File;
+use Illuminate\Support\Facades\Session;
 use Illuminate\Support\MessageBag;
+use Illuminate\Support\ViewErrorBag;
 
 abstract class Service {
     /*
@@ -225,6 +227,35 @@ public function logAdminAction($user, $action, $action_details) {
         }
     }
 
+    /**
+     * Add an error to Laravel session $errors.
+     *
+     * @author Pavel Lint via https://stackoverflow.com/questions/58690463/best-way-to-store-error-messages-in-laravel-session-or-variable with modifications
+     *
+     * @param string $key
+     * @param bool   $flash
+     * @param string $error_msg
+     */
+    public function addError($error_msg, $flash = true, $key = 'default') {
+        $errors = Session::get('errors', new ViewErrorBag);
+
+        if (!$errors instanceof ViewErrorBag) {
+            $errors = new ViewErrorBag;
+        }
+
+        $bag = $errors->getBags()['default'] ?? new MessageBag;
+        $bag->add($key, $error_msg);
+
+        Session::flash(
+            'errors',
+            $errors->put('default', $bag)
+        );
+
+        if ($flash) {
+            flash($error_msg)->error();
+        }
+    }
+
     /**
      * Calls a service method and injects the required dependencies.
      *
diff --git a/phpunit.xml b/phpunit.xml
index da4add3072..ae0cccab4e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -1,33 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit backupGlobals="false"
-         backupStaticAttributes="false"
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="./vendor/phpunit/phpunit/phpunit.xsd"
          bootstrap="vendor/autoload.php"
+         backupGlobals="false"
+         backupStaticAttributes="false"
          colors="true"
-         convertErrorsToExceptions="true"
-         convertNoticesToExceptions="true"
-         convertWarningsToExceptions="true"
-         processIsolation="false"
-         stopOnFailure="false">
+         stopOnFailure="false"
+         processIsolation="true"
+>
     <testsuites>
-        <testsuite name="Unit">
-            <directory suffix="Test.php">./tests/Unit</directory>
-        </testsuite>
-
         <testsuite name="Feature">
             <directory suffix="Test.php">./tests/Feature</directory>
         </testsuite>
+        <testsuite name="Unit">
+            <directory suffix="Test.php">./tests/Unit</directory>
+        </testsuite>
     </testsuites>
-    <filter>
-        <whitelist processUncoveredFilesFromWhitelist="true">
+    <coverage processUncoveredFiles="true">
+        <include>
             <directory suffix=".php">./app</directory>
-        </whitelist>
-    </filter>
+        </include>
+    </coverage>
     <php>
         <server name="APP_ENV" value="testing"/>
         <server name="BCRYPT_ROUNDS" value="4"/>
         <server name="CACHE_DRIVER" value="array"/>
-        <server name="MAIL_DRIVER" value="array"/>
+        <env name="DB_CONNECTION" value="mysql"/>
+        <env name="DB_USERNAME" value="root"/>
+        <env name="DB_DATABASE" value="lorekeeper_test"/>
+        <env name="DB_HOST" value="127.0.0.1" />
+        <env name="DB_PORT" value="3306" />
+        <server name="MAIL_MAILER" value="array"/>
         <server name="QUEUE_CONNECTION" value="sync"/>
         <server name="SESSION_DRIVER" value="array"/>
+        <server name="TELESCOPE_ENABLED" value="false"/>
     </php>
 </phpunit>
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 1fa2d53ac2..1b5289439b 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -1,3 +1,4 @@
+<?php header('Permissions-Policy: interest-cohort=()'); ?>
 <!DOCTYPE html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
 
diff --git a/tests/Feature/AccessTest.php b/tests/Feature/AccessTest.php
new file mode 100644
index 0000000000..169f2849cd
--- /dev/null
+++ b/tests/Feature/AccessTest.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
+
+class AccessTest extends TestCase {
+    use RefreshDatabase;
+
+    /**
+     * Test landing page access.
+     */
+    public function testCanAccessHomepage() {
+        // Ensure 'about' is present to access, otherwise it will error
+        $this->artisan('add-text-pages');
+
+        $response = $this->get('/');
+
+        $response->assertStatus(200);
+    }
+}
diff --git a/tests/Feature/ExampleTest.php b/tests/Feature/ExampleTest.php
deleted file mode 100644
index 0aaa988db0..0000000000
--- a/tests/Feature/ExampleTest.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use Tests\TestCase;
-
-class ExampleTest extends TestCase {
-    /**
-     * A basic test example.
-     */
-    public function testBasicTest() {
-        $response = $this->get('/');
-
-        $response->assertStatus(200);
-    }
-}
diff --git a/tests/Unit/ExampleTest.php b/tests/Unit/Example.php
similarity index 82%
rename from tests/Unit/ExampleTest.php
rename to tests/Unit/Example.php
index dd024df7b1..a0a8ace8b2 100644
--- a/tests/Unit/ExampleTest.php
+++ b/tests/Unit/Example.php
@@ -4,7 +4,7 @@
 
 use Tests\TestCase;
 
-class ExampleTest extends TestCase {
+class Example extends TestCase {
     /**
      * A basic test example.
      */