2 files changed, 5 insertions, 0 deletions
diff --git a/minirake b/minirake
index 7bda33f3b..49772168c 100755
--- a/minirake
+++ b/minirake
@@ -411,6 +411,7 @@ class RakeApp
       else
         puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || ""
       end
+      exit 1
     end    
   end
 end
diff --git a/mrbgems/build_tasks.rb b/mrbgems/build_tasks.rb
index 0eb2608bf..3c6c457c0 100644
--- a/mrbgems/build_tasks.rb
+++ b/mrbgems/build_tasks.rb
@@ -68,6 +68,10 @@ end
 def for_each_gem(&block)
   IO.readlines(ACTIVE_GEMS).map { |line|
     path = line.chomp
+    if not File.exist?(path)
+      path2 = File.join MRUBY_ROOT, 'mrbgems', 'g', path
+      path = path2 if File.exist? path2
+    end
     gemname = File.basename(path)
     escaped_gemname = gemname.gsub(/-/, '_')
     block.call(path, gemname, escaped_gemname)