Merge pull request #16040 from Godmartinz/template_validate_error

Adds a null check to label templates, adds return types for validation methods

app/Http/Controllers/SettingsController.php

@@ -800,6 +800,7 @@ class SettingsController extends Controller
         }
 
         if ($setting->save()) {
+
             return redirect()->route('settings.labels.index')
                 ->with('success', trans('admin/settings/message.update.success'));
         }