diff --git a/app/Http/Controllers/StatuslabelsController.php b/app/Http/Controllers/StatuslabelsController.php
index 89542d1127..cbaa72214a 100755
--- a/app/Http/Controllers/StatuslabelsController.php
+++ b/app/Http/Controllers/StatuslabelsController.php
@@ -227,7 +227,7 @@ class StatuslabelsController extends Controller
         if ($statuslabel->has_assets() > 0) {
 
             // Redirect to the asset management page
-            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_users'));
+            return redirect()->to('admin/settings/statuslabels')->with('error', trans('admin/statuslabels/message.assoc_assets'));
         } else {
 
             $statuslabel->delete();
diff --git a/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php b/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
index d89677f345..4a0c1480c6 100644
--- a/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
+++ b/database/migrations/2016_05_20_024859_remove_option_keys_from_settings_table.php
@@ -14,7 +14,7 @@ class RemoveOptionKeysFromSettingsTable extends Migration
     {
         Schema::table('settings', function (Blueprint $table) {
             //
-            if(Schema::hasColumn('option_name', 'settings'))
+            if(Schema::hasColumn('settings', 'option_name'))
                 $table->dropColumn('option_name');
         });
     }
diff --git a/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php b/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php
index 302baaa8cb..2836aaefb6 100644
--- a/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php
+++ b/database/migrations/2016_05_20_143758_remove_option_value_from_settings_table.php
@@ -14,7 +14,7 @@ class RemoveOptionValueFromSettingsTable extends Migration
     {
         Schema::table('settings', function (Blueprint $table) {
             //
-            if(Schema::hasColumn('option_value', 'settings'))
+            if(Schema::hasColumn('settings', 'option_value'))
                 $table->dropColumn('option_value');
         });
     }
diff --git a/resources/lang/en/admin/statuslabels/message.php b/resources/lang/en/admin/statuslabels/message.php
index 98280082ef..619a5a509c 100644
--- a/resources/lang/en/admin/statuslabels/message.php
+++ b/resources/lang/en/admin/statuslabels/message.php
@@ -2,24 +2,24 @@
 
 return array(
 
-    'does_not_exist' => 'Location does not exist.',
-    'assoc_users'	 => 'This location is currently associated with at least one user and cannot be deleted. Please update your users to no longer reference this location and try again. ',
+    'does_not_exist' => 'Status Label does not exist.',
+    'assoc_assets'	 => 'This Status Label is currently associated with at least one Asset and cannot be deleted. Please update your assets to no longer reference this status and try again. ',
 
 
     'create' => array(
-        'error'   => 'Location was not created, please try again.',
-        'success' => 'Location created successfully.'
+        'error'   => 'Status Label was not created, please try again.',
+        'success' => 'Status Label created successfully.'
     ),
 
     'update' => array(
-        'error'   => 'Location was not updated, please try again',
-        'success' => 'Location updated successfully.'
+        'error'   => 'Status Label was not updated, please try again',
+        'success' => 'Status Label updated successfully.'
     ),
 
     'delete' => array(
-        'confirm'   => 'Are you sure you wish to delete this status label?',
-        'error'   => 'There was an issue deleting the location. Please try again.',
-        'success' => 'The location was deleted successfully.'
+        'confirm'   => 'Are you sure you wish to delete this Status Label?',
+        'error'   => 'There was an issue deleting the Status Label. Please try again.',
+        'success' => 'The Status Label was deleted successfully.'
     )
 
 );