diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2b1d7db..54bd7810 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -24,7 +24,8 @@ Added [feature#14] EventTimeStamp decoding from ReadPropertyMultiple app
 
 ### Fixed
 
-Fixed datetime decode of invalid application tag. (#495)
+- Fixed datetime decode of invalid application tag. (#495)
+- Fixed extraneous SO_BINDTODEVICE error message in Linux BIP
 
 ## [1.2.0] - 2023-09-11
 
diff --git a/ports/linux/bip-init.c b/ports/linux/bip-init.c
index 62bcce92..e9a6b798 100644
--- a/ports/linux/bip-init.c
+++ b/ports/linux/bip-init.c
@@ -863,7 +863,9 @@ static int createSocket(struct sockaddr_in *sin)
     status = setsockopt(sock_fd, SOL_SOCKET, SO_BINDTODEVICE,
         BIP_Interface_Name, strlen(BIP_Interface_Name));
     if (status < 0) {
-        perror("SO_BINDTODEVICE: ");
+        if (BIP_Debug) {
+            perror("SO_BINDTODEVICE: ");
+	}
     }
     /* bind the socket to the local port number and IP address */
     status =