diff --git a/app/Http/Controllers/Wizard/Currencies.php b/app/Http/Controllers/Wizard/Currencies.php
index 8ae9e6591..11ff3589c 100644
--- a/app/Http/Controllers/Wizard/Currencies.php
+++ b/app/Http/Controllers/Wizard/Currencies.php
@@ -35,7 +35,7 @@ class Currencies extends Controller
      */
     public function create()
     {
-        if (setting(setting('general.wizard', false))) {
+        if (setting('general.wizard', false)) {
             return redirect('/');
         }
 
diff --git a/app/Http/Controllers/Wizard/Finish.php b/app/Http/Controllers/Wizard/Finish.php
index 25a9727fb..004c924b4 100644
--- a/app/Http/Controllers/Wizard/Finish.php
+++ b/app/Http/Controllers/Wizard/Finish.php
@@ -17,7 +17,7 @@ class Finish extends Controller
      */
     public function index()
     {
-        if (setting(setting('general.wizard', false))) {
+        if (setting('general.wizard', false)) {
             return redirect('/');
         }
 
diff --git a/app/Http/Controllers/Wizard/Taxes.php b/app/Http/Controllers/Wizard/Taxes.php
index c1bbecc6b..ce465ff76 100644
--- a/app/Http/Controllers/Wizard/Taxes.php
+++ b/app/Http/Controllers/Wizard/Taxes.php
@@ -15,7 +15,7 @@ class Taxes extends Controller
      */
     public function index()
     {
-        if (setting(setting('general.wizard', false))) {
+        if (setting('general.wizard', false)) {
             return redirect('/');
         }
 
@@ -31,7 +31,7 @@ class Taxes extends Controller
      */
     public function create()
     {
-        if (setting(setting('general.wizard', false))) {
+        if (setting('general.wizard', false)) {
             return redirect('/');
         }
 
@@ -75,7 +75,7 @@ class Taxes extends Controller
      */
     public function edit(Tax $tax)
     {
-        if (setting(setting('general.wizard', false))) {
+        if (setting('general.wizard', false)) {
             return redirect('/');
         }
 
diff --git a/resources/views/wizard/taxes/index.blade.php b/resources/views/wizard/taxes/index.blade.php
index c02318317..015d935cf 100644
--- a/resources/views/wizard/taxes/index.blade.php
+++ b/resources/views/wizard/taxes/index.blade.php
@@ -176,7 +176,7 @@
                     html += '               <li><a href="javascript:void(0);" data-href="wizard/taxes/' + tax.id + '/disable" class="tax-disable">{{ trans('general.disable') }}</a></li>';
                     html += '               <li class="divider"></li>';
                     html += '               <li>';
-                    html += '                   <button type="button" class="delete-link" title="{{ trans('general.delete') }}" onclick="confirmCurrency("#tax-' + tax.id + '", "{{ trans_choice('general.taxes', 2) }}", "{{ trans('general.delete_confirm', ['name' => '<strong>' . $item->name . '</strong>', 'type' => mb_strtolower(trans_choice('general.taxes', 1))]) }}", "{{ trans('general.cancel') }}", "{{ trans('general.delete') }}")">{{ trans('general.delete') }}</button>';
+                    html += '                   <button type="button" class="delete-link" title="{{ trans('general.delete') }}" onclick="confirmCurrency("#tax-' + tax.id + '", "{{ trans_choice('general.taxes', 2) }}", "{{ trans('general.delete_confirm', ['name' => !empty($item) ? '<strong>' . $item->name . '</strong>' : '', 'type' => mb_strtolower(trans_choice('general.taxes', 1))]) }}", "{{ trans('general.cancel') }}", "{{ trans('general.delete') }}")">{{ trans('general.delete') }}</button>';
                     html += '               </li>';
                     html += '           </ul>';
                     html += '       </div>';