diff --git a/frontend/delta/js/Clipperz/PM/DataModel/Record.js b/frontend/delta/js/Clipperz/PM/DataModel/Record.js
index f3bd761..3d6b150 100644
--- a/frontend/delta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/delta/js/Clipperz/PM/DataModel/Record.js
@@ -581,7 +581,8 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.Record, Clipperz.PM.DataModel.Encrypt
 						result = someFilteredResults[0];
 						break;
 					default:
-						WTF = TODO;
+console.log("Warning: Record.fieldWithLabel('" + aLabel + "') is returning more than one result: " + someFilteredResults.length);
+						result = someFilteredResults[0];
 						break;
 				}
 				
diff --git a/frontend/delta/js/Clipperz/PM/DataModel/User.js b/frontend/delta/js/Clipperz/PM/DataModel/User.js
index 58e16e5..96ebc6d 100644
--- a/frontend/delta/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/delta/js/Clipperz/PM/DataModel/User.js
@@ -681,6 +681,7 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 		], {trace:false});
 	},
 */
+
 	'recordWithLabel': function (aLabel) {
 		return Clipperz.Async.callbacks("User.recordWithLabel", [
 			MochiKit.Base.method(this, 'getRecords'),
@@ -701,7 +702,8 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 						result = someFilteredResults[0];
 						break;
 					default:
-						WTF = TODO;
+console.log("Warning: User.recordWithLabel('" + aLabel + "') is returning more than one result: " + someFilteredResults.length);
+						result = someFilteredResults[0];
 						break;
 				}