diff --git a/plugin/vimux.vim b/plugin/vimux.vim
index 1e99183..99f6519 100644
--- a/plugin/vimux.vim
+++ b/plugin/vimux.vim
@@ -137,6 +137,7 @@ class TmuxSession
         _run("split-window -p #{height} #{orientation}")
       end
       @runner_pane = active_pane_id
+      _send_command("cd #{`pwd`}", target(:pane => runner_pane))
       Vim.command("let g:_VimTmuxRunnerPane = '#{@runner_pane}'")
     end
 
@@ -189,11 +190,15 @@ end
 
 class CurrentTmuxSession < TmuxSession
   def initialize
-    session = self.get_session
-    window = self.get_property(:active, :window)
-    pane = self.get_property(:active, :pane)
+    if tmux?
+      session = self.get_session
+      window = self.get_property(:active, :window)
+      pane = self.get_property(:active, :pane)
 
-    super(session, window, pane)
+      super(session, window, pane)
+    else
+      raise "You are not in a tmux session"
+    end
   end
 
   def get_property(match, type)
@@ -205,5 +210,9 @@ class CurrentTmuxSession < TmuxSession
   def get_session
     _run("display -p '#S'").strip
   end
+
+  def tmux?
+    `echo $TMUX` =~ /.+/ ? true : false
+  end
 end
 EOF