Index: trunk/grails-app/services/AddressService.groovy
===================================================================
--- trunk/grails-app/services/AddressService.groovy	(revision 399)
+++ trunk/grails-app/services/AddressService.groovy	(revision 401)
@@ -56,22 +56,15 @@
 
     private checkForOwner(params) {
-        def manufacturerInstance
-        def supplierInstance
-        def personInstance
-        def siteInstance
 
         if(params.manufacturer?.id)
-            manufacturerInstance = Manufacturer.get(params.manufacturer.id)
+            return Manufacturer.exists(params.manufacturer.id)
         if(params.supplier?.id)
-            supplierInstance = Supplier.get(params.supplier.id)
+            return Supplier.exists(params.supplier.id)
         if(params.person?.id)
-            personInstance = Person.get(params.person.id)
+            return Person.exists(params.person.id)
         if(params.site?.id)
-            siteInstance = Site.get(params.site?.id)
+            return Site.exists(params.site.id)
 
-        if(!manufacturerInstance && !supplierInstance && !personInstance && !siteInstance)
-            return false
-
-        return true
+        return false
     }