1 files changed, 12 insertions, 7 deletions
diff --git a/ext/socket/socket.c b/ext/socket/socket.c
index be7bd62236..3ee725d8b5 100644
--- a/ext/socket/socket.c
+++ b/ext/socket/socket.c
@@ -29,16 +29,21 @@ void
 rsock_sys_fail_path(const char *mesg, VALUE path)
 {
     VALUE message;
-    if (memchr(RSTRING_PTR(path), '\0', RSTRING_LEN(path))) {
-        path = rb_str_inspect(path);
-        message = rb_sprintf("%s for %s", mesg,
-                StringValueCStr(path));
+    if (RB_TYPE_P(path, T_STRING)) {
+        if (memchr(RSTRING_PTR(path), '\0', RSTRING_LEN(path))) {
+            path = rb_str_inspect(path);
+            message = rb_sprintf("%s for %s", mesg,
+                    StringValueCStr(path));
+        }
+        else {
+            message = rb_sprintf("%s for \"%s\"", mesg,
+                    StringValueCStr(path));
+        }
+        rb_sys_fail_str(message);
     }
     else {
-        message = rb_sprintf("%s for \"%s\"", mesg,
-                StringValueCStr(path));
+        rb_sys_fail(mesg);
     }
-    rb_sys_fail_str(message);
 }
 
 void