diff --git a/lib/god.rb b/lib/god.rb
index <HASH>..<HASH> 100644
--- a/lib/god.rb
+++ b/lib/god.rb
@@ -534,6 +534,9 @@ module God
       watches = self.pending_watches.dup
       self.pending_watches.clear
       self.pending_watch_states.clear
+
+      # make sure we quit capturing when we're done
+      LOG.finish_capture
     rescue Exception => e
       # don't ever let running_load take down god
       errors << LOG.finish_capture
diff --git a/lib/god/logger.rb b/lib/god/logger.rb
index <HASH>..<HASH> 100644
--- a/lib/god/logger.rb
+++ b/lib/god/logger.rb
@@ -114,7 +114,7 @@ module God
     # Returns String
     def finish_capture
       @mutex.synchronize do
-        cap = @capture.string
+        cap = @capture.string if @capture
         @capture = nil
         cap
       end
Fix memory leak when issuing "god load" successfully