--- ucs/management/univention-directory-manager-modules/univention-dnsedit	2012-10-12 09:17:29.963718500 +0200
+++ univention-dnsedit	2012-10-16 12:03:28.583650882 +0200
@@ -209,16 +209,18 @@
 	if records:
 		record = records[0]
 	else:
-		record = srv_record.object(co, lo, position, superordinate=zone)
-		record['name'] = name
+		print >> sys.stderr, "No record found"
+		return
 
 	loc = record['location']
 	if location in loc:
 		loc.remove(location)
-		record['location'] = loc
-
-	if records:
-		record.modify()
+		if loc:
+			record.modify()
+		else:
+			record.remove()
+	else:
+		print >> sys.stderr, "Does not exist"
 
 
 def add_txt_record(name, text):
@@ -385,11 +387,13 @@
 	except univention.admin.uexceptions.objectExists, ex:
 		if not options.ignore_exists:
 			print >> sys.stderr, 'E: Object "%s" exists' % (ex,)
+			raise
 			sys.exit(1)
 	except (ValueError, TypeError,
 			univention.admin.uexceptions.valueInvalidSyntax,
 			univention.admin.uexceptions.valueRequired), ex:
 		print >> sys.stderr, 'E: failed %s' % (ex,)
+		raise
 		sys.exit(1)