diff --git a/osdep-sunos.c b/osdep-sunos.c
index fd644f5d..d071694e 100644
--- a/osdep-sunos.c
+++ b/osdep-sunos.c
@@ -69,10 +69,19 @@ osdep_get_cwd(int fd)
 {
 	static char	 target[MAXPATHLEN + 1];
 	char		*path;
+	const char	*ttypath;
 	ssize_t		 n;
 	pid_t		 pgrp;
+	int		 retval, ttyfd;
 
-	if ((pgrp = tcgetpgrp(fd)) == -1)
+	if ((ttypath = ptsname(fd)) == NULL)
+		return (NULL);
+	if ((ttyfd = open(ttypath, O_RDONLY|O_NOCTTY)) == -1)
+		return (NULL);
+
+	retval = ioctl(ttyfd, TIOCGPGRP, &pgrp);
+	close(ttyfd);
+	if (retval == -1)
 		return (NULL);
 
 	xasprintf(&path, "/proc/%u/path/cwd", (u_int) pgrp);
diff --git a/server-client.c b/server-client.c
index 45cc40ca..1942926b 100644
--- a/server-client.c
+++ b/server-client.c
@@ -550,7 +550,7 @@ server_client_check_resize(struct window_pane *wp)
 		 * other platforms and ignoring it doesn't seem to cause any
 		 * issues.
 		 */
-		if (errno != EINVAL)
+		if (errno != EINVAL && errno != ENXIO)
 #endif
 		fatal("ioctl failed");
 	}