diff --git a/lib/link/link.js b/lib/link/link.js
index d6b7432d..c2ba460a 100644
--- a/lib/link/link.js
+++ b/lib/link/link.js
@@ -62,7 +62,7 @@ class Link {
 
 		let validator = this._validators.get(message.type);
 		if (!validator) {
-			throw new errors.InvalidMessage(`No validator for ${message.type}`);
+			throw new errors.InvalidMessage(`No validator for ${message.type} on ${this.source}-${this.target}`);
 		}
 
 		if (!validator(message)) {
@@ -180,7 +180,7 @@ class Link {
 	 */
 	async waitFor(type, data) {
 		if (!this._validators.has(type)) {
-			throw new Error(`no validator for ${type}`);
+			throw new Error(`No validator for ${type} on ${this.source}-${this.target}`);
 		}
 
 		return new Promise((resolve, reject) => {
diff --git a/lib/link/messages.js b/lib/link/messages.js
index 4cc1bd7a..c7a8f8f3 100644
--- a/lib/link/messages.js
+++ b/lib/link/messages.js
@@ -82,7 +82,7 @@ class Request {
 		// Target side.  Note: Source and target is reversed here.
 		if (this.links.includes(`${link.target}-${link.source}`)) {
 			if (!handler) {
-				throw new Error(`Missing handler for ${this.requestType} on ${link.target}-${link.source} link`);
+				throw new Error(`Missing handler for ${this.requestType} on ${link.source}-${link.target} link`);
 			}
 
 			link.setHandler(this.requestType, message => {
@@ -361,7 +361,7 @@ class Event {
 		// Target side.  Note: Source and target is reversed here.
 		if (this.links.includes(`${link.target}-${link.source}`)) {
 			if (!handler) {
-				throw new Error(`Missing handler for ${this.eventType} on ${link.target}-${link.source} link`);
+				throw new Error(`Missing handler for ${this.eventType} on ${link.source}-${link.target} link`);
 			}
 
 			link.setHandler(this.eventType, message => {
diff --git a/test/lib/link/link.js b/test/lib/link/link.js
index 8ca161fc..f93f578a 100644
--- a/test/lib/link/link.js
+++ b/test/lib/link/link.js
@@ -64,7 +64,7 @@ describe("lib/link/link", function() {
 			it("should throw on message without validator", function() {
 				assert.throws(
 					() => testLink.processMessage({ seq: 1, type: 'no_validator', data: {} }),
-					new errors.InvalidMessage("No validator for no_validator")
+					new errors.InvalidMessage("No validator for no_validator on source-target")
 				);
 			});
 			it("should throw on message failing validation", function() {
@@ -134,7 +134,7 @@ describe("lib/link/link", function() {
 			it("should throw on missing validator", async function() {
 				await assert.rejects(
 					testLink.waitFor('no_validator', {}),
-					new Error("no validator for no_validator")
+					new Error("No validator for no_validator on source-target")
 				);
 			});
 			it("should wait for a given message", async function() {
diff --git a/test/lib/link/messages.js b/test/lib/link/messages.js
index 1fa245c6..3a6f9a52 100644
--- a/test/lib/link/messages.js
+++ b/test/lib/link/messages.js
@@ -26,7 +26,7 @@ describe("lib/link/messages", function() {
 			it("should throw if missing handler on target link", function() {
 				assert.throws(
 					() => testRequest.attach(testTargetLink),
-					new Error("Missing handler for test_request on source-target link")
+					new Error("Missing handler for test_request on target-source link")
 				);
 			});
 
@@ -120,7 +120,7 @@ describe("lib/link/messages", function() {
 			it("should throw if missing handler on target link", function() {
 				assert.throws(
 					() => testEvent.attach(testTargetLink),
-					new Error("Missing handler for test_event on source-target link")
+					new Error("Missing handler for test_event on target-source link")
 				);
 			});
 			let called = false;