diff --git a/app/controllers/admin/ManufacturersController.php b/app/controllers/admin/ManufacturersController.php
index 01221a423e..d7f0056f39 100644
--- a/app/controllers/admin/ManufacturersController.php
+++ b/app/controllers/admin/ManufacturersController.php
@@ -159,11 +159,24 @@ class ManufacturersController extends AdminController {
 			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.not_found'));
 		}
 
-		// Delete the manufacturer
-		$manufacturer->delete();
+		if ($manufacturer->has_models() > 0) {
 
-		// Redirect to the manufacturers management page
+			// Redirect to the asset management page
+			return Redirect::to('admin/settings/manufacturers')->with('error', Lang::get('admin/manufacturers/message.assoc_users'));
+		} else {
+
+			// Delete the manufacturer
+			$manufacturer->delete();
+
+			// Redirect to the manufacturers management page
 		return Redirect::to('admin/settings/manufacturers')->with('success', Lang::get('admin/manufacturers/message.delete.success'));
+		}
+
+
+
+
+
+
 	}
 
 
diff --git a/app/lang/en/admin/manufacturers/message.php b/app/lang/en/admin/manufacturers/message.php
index 5ae15966b8..e292c39599 100755
--- a/app/lang/en/admin/manufacturers/message.php
+++ b/app/lang/en/admin/manufacturers/message.php
@@ -3,6 +3,7 @@
 return array(
 
 	'does_not_exist' => 'Manufacturer does not exist.',
+	'assoc_users'	 => 'This manufacturer is currently associated with at least one model and cannot be deleted. Please update your models to no longer reference this manufacturer and try again. ',
 
 	'create' => array(
 		'error'   => 'Manufacturer was not created, please try again.',
diff --git a/app/models/Manufacturer.php b/app/models/Manufacturer.php
index e9bf470d17..fbca1df387 100644
--- a/app/models/Manufacturer.php
+++ b/app/models/Manufacturer.php
@@ -6,4 +6,9 @@ class Manufacturer extends Elegant {
 		'name'   => 'required|min:2',
 	);
 
+	public function has_models()
+	{
+		return $this->hasMany('Model', 'manufacturer_id')->count();
+	}
+
 }