diff --git a/pythonx/jedi_vim.py b/pythonx/jedi_vim.py
index c61fc79..4cba19e 100644
--- a/pythonx/jedi_vim.py
+++ b/pythonx/jedi_vim.py
@@ -262,7 +262,7 @@ def goto(mode="goto", no_output=False):
                                % d.desc_with_module)
         else:
             using_tagstack = int(vim_eval('g:jedi#use_tag_stack')) == 1
-            if d.module_path != vim.current.buffer.name:
+            if (d.module_path or '') != vim.current.buffer.name:
                 result = new_buffer(d.module_path,
                                     using_tagstack=using_tagstack)
                 if not result:
diff --git a/test/goto.vim b/test/goto.vim
index aaa6602..593125a 100644
--- a/test/goto.vim
+++ b/test/goto.vim
@@ -23,6 +23,7 @@ describe 'goto simple'
     it 'goto definitions'
         normal \d
         Expect line('.') == 1
+        Expect col('.') == 5
     end
 
     it 'goto assignments'
@@ -111,7 +112,7 @@ describe 'goto with buffers'
         put = ['import os']
         normal G$
         call jedi#goto_assignments()
-        python jedi_vim.goto()
+        PythonJedi jedi_vim.goto()
         Expect CurrentBufferIsModule('os') == 0
         " Without hidden, it's not possible to open a new buffer, when the old
         " one is not saved.