--- a/Commands/Debug - Copy inspection to clipboard as YAML.tmCommand	
+++ b/Commands/Debug - Copy inspection to clipboard as YAML.tmCommand	
@@ -12,7 +12,7 @@ d = RubyAMP::RemoteDebugger.new
 exit unless d.connected?
 
 what = RubyAMP::Inspect.get_selection
-RubyAMP::Inspect.copy_to_clipboard(d.inspect(what, :yaml))
+RubyAMP::Inspect.copy_to_clipboard(d.evaluate(what, :current, :yaml))
 puts "Copied value of #{what} to clipboard"</string>
 	<key>input</key>
 	<string>document</string>

--- a/Commands/Debug - Copy inspection to clipboard as pretty print.tmCommand	
+++ b/Commands/Debug - Copy inspection to clipboard as pretty print.tmCommand	
@@ -12,7 +12,7 @@ d = RubyAMP::RemoteDebugger.new
 exit unless d.connected?
 
 what = RubyAMP::Inspect.get_selection
-RubyAMP::Inspect.copy_to_clipboard(d.inspect(what, :pp))
+RubyAMP::Inspect.copy_to_clipboard(d.evaluate(what, :current, :pp))
 puts "Copied value of #{what} to clipboard"</string>
 	<key>input</key>
 	<string>document</string>

--- a/Commands/Debug - Copy inspection to clipboard as string.tmCommand	
+++ b/Commands/Debug - Copy inspection to clipboard as string.tmCommand	
@@ -12,7 +12,7 @@ d = RubyAMP::RemoteDebugger.new
 exit unless d.connected?
 
 what = RubyAMP::Inspect.get_selection
-RubyAMP::Inspect.copy_to_clipboard(d.inspect(what, :string))
+RubyAMP::Inspect.copy_to_clipboard(d.evaluate(what, :current, :string))
 puts "Copied value of #{what} to clipboard"</string>
 	<key>input</key>
 	<string>document</string>

--- a/Commands/Debug - Inspect with pretty print.tmCommand	
+++ b/Commands/Debug - Inspect with pretty print.tmCommand	
@@ -13,7 +13,7 @@ exit unless d.connected?
 
 what = RubyAMP::Inspect.get_selection
 
-puts "#{what} = \n#{d.inspect(what, :pp)}"
+puts "#{what} = \n#{d.evaluate(what, :current, :pp)}"
 </string>
 	<key>fallbackInput</key>
 	<string>word</string>

--- a/Support/ext/debugger_extension.rb
+++ b/Support/ext/debugger_extension.rb
@@ -16,6 +16,25 @@ module Debugger
       eval(cmd, current_binding)
     end
     
+    def evaluate(cmd, binding = :current, format = :raw)
+      result = Kernel.eval(cmd, (binding == :current) ? current_binding : Kernel.binding)
+      case format
+      when :pp
+        require('pp')
+        ::PP.pp(result, output='')
+        output
+      when :yaml
+        require('yaml')
+        result.to_yaml
+      when :string
+        result.to_s
+      when :raw
+        result
+      end
+    rescue Exception => e
+      "Error inspecting #{cmd} - #{e.inspect}"  
+    end
+    
     def wait_for_connection
       while Debugger.handler.interface.nil?; sleep 0.10; end
     end

--- a/Support/lib/ruby_amp/remote_debugger.rb
+++ b/Support/lib/ruby_amp/remote_debugger.rb
@@ -85,19 +85,11 @@ module RubyAMP
       read_output
     end
   
-    def raw_evaluate(cmd, binding = :current)
-      case binding
-      when :current
-        command("e Debugger.eval_from_current_binding(#{cmd.inspect})")
-      when :control
-        command("e send(:eval, #{cmd.inspect})")
-      end
-    end
-  
-    def evaluate(cmd, binding = :current)  
-      o = raw_evaluate(cmd, binding)
-      return o if o.nil? || (line = o.split("\n").first).nil? || line.match(/^[a-z:]+ *Exception: /i)
+    def evaluate(cmd, binding = :current, format = :raw)  
+      o = command("e Debugger.evaluate(#{cmd.inspect}, :#{binding}, :#{format})")
       eval(o)
+    rescue Exception
+      o
     end
   
     def current_frame
@@ -105,16 +97,7 @@ module RubyAMP
     end
   
     def inspect(expression, format = :pp)
-      case format
-      when :pp
-        evaluate("::Object.require('pp'); ::Object::PP.pp((#{expression}), __tmp_output__=''); __tmp_output__")
-      when :yaml
-        evaluate("::Object.require 'yaml'; (#{expression}).to_yaml")
-      when :string
-        evaluate("#{expression}.to_s")
-      when :raw
-        raw_evaluate(expression)
-      end
+      evaluate(expression, :current, format)
     end
     
     AUTO_LOAD = {