diff --git a/ChangeLog.asciidoc b/ChangeLog.asciidoc
index e2227873a..ec24a9df4 100644
--- a/ChangeLog.asciidoc
+++ b/ChangeLog.asciidoc
@@ -84,6 +84,7 @@ http://weechat.org/files/releasenotes/ReleaseNotes-devel.html[release notes]
 * relay: fix freeze after /upgrade when many disconnected clients still exist
 * relay: fix NULL pointer when reading buffer lines for irc backlog
 * rmodifier: remove plugin (replaced by trigger)
+* ruby: fix crash when trying to load a directory with /ruby load
 * ruby: add detection of Ruby 2.1
 * script: fix scroll on script buffer in the detailed view of script
   (closes #6)
diff --git a/src/plugins/ruby/weechat-ruby.c b/src/plugins/ruby/weechat-ruby.c
index 2dfdb8bbd..d92b180b7 100644
--- a/src/plugins/ruby/weechat-ruby.c
+++ b/src/plugins/ruby/weechat-ruby.c
@@ -572,10 +572,10 @@ weechat_ruby_load (const char *filename)
                 break;
         }
 
-        if (NUM2INT(ruby_retcode) == 1 || NUM2INT(ruby_retcode) == 2)
+        if (NUM2INT(ruby_retcode) == 2)
         {
-            weechat_ruby_print_exception(rb_iv_get (ruby_current_module,
-                                                    "@load_eval_file_error"));
+            weechat_ruby_print_exception (rb_iv_get (ruby_current_module,
+                                                     "@load_eval_file_error"));
         }
 
         return 0;