diff --git a/libweston/compositor-rdp.c b/libweston/compositor-rdp.c
index 79f06877..53c71248 100644
--- a/libweston/compositor-rdp.c
+++ b/libweston/compositor-rdp.c
@@ -1263,7 +1263,8 @@ rdp_backend_create(struct weston_compositor *compositor,
 		}
 
 		fd = strtoul(fd_str, &fd_tail, 10);
-		if (fd_tail == fd_str || rdp_peer_init(freerdp_peer_new(fd), b))
+		if (errno != 0 || fd_tail == fd_str || *fd_tail != '\0'
+		    || rdp_peer_init(freerdp_peer_new(fd), b))
 			goto err_output;
 	}