diff --git a/.vimrc b/.vimrc
index 40e3a3c..9132085 100644
--- a/.vimrc
+++ b/.vimrc
@@ -17,6 +17,11 @@ filetype plugin indent on
 syntax enable
 syntax sync maxlines=100
 set synmaxcol=200
+
+augroup customft
+    autocmd!
+    autocmd BufNewFile,BufRead *.vim* set filetype=vim
+augroup END
 "}}}
 
 "Options
diff --git a/plugin/statusline.vim b/plugin/statusline.vim
index 6e5f3b7..7b0e5c5 100644
--- a/plugin/statusline.vim
+++ b/plugin/statusline.vim
@@ -1,4 +1,7 @@
 function! GetGitStatus()
+    if !exists('*fugitive#statusline')
+        return ''
+    endif
     let result=fugitive#statusline()
     if strlen(result) == 0
         return result