1 files changed, 4 insertions, 2 deletions
diff --git a/lib/psych.rb b/lib/psych.rb
index 574bc7e641..c14259373a 100644
--- a/lib/psych.rb
+++ b/lib/psych.rb
@@ -101,7 +101,8 @@ module Psych
   #   Psych.load("--- a")           # => 'a'
   #   Psych.load("---\n - a\n - b") # => ['a', 'b']
   def self.load yaml
-    parse(yaml).to_ruby
+    result = parse(yaml)
+    result ? result.to_ruby : result
   end
 
   ###
@@ -113,7 +114,8 @@ module Psych
   #
   # See Psych::Nodes for more information about YAML AST.
   def self.parse yaml
-    parse_stream(yaml).children.first.children.first
+    children = parse_stream(yaml).children
+    children.empty? ? false : children.first.children.first
   end
 
   ###