diff --git a/autoload/airline/extensions.vim b/autoload/airline/extensions.vim
index 25f47ec9..01942463 100644
--- a/autoload/airline/extensions.vim
+++ b/autoload/airline/extensions.vim
@@ -138,7 +138,7 @@ function! airline#extensions#load()
     call airline#extensions#netrw#init(s:ext)
   endif
 
-  if exists(':YcmDiag')
+  if get(g:, 'airline#extensions#ycm#enabled', 0)
     call airline#extensions#ycm#init(s:ext)
   endif
 
diff --git a/autoload/airline/init.vim b/autoload/airline/init.vim
index 500daae6..6a4cca89 100644
--- a/autoload/airline/init.vim
+++ b/autoload/airline/init.vim
@@ -119,10 +119,10 @@ function! airline#init#sections()
     let g:airline_section_z = airline#section#create(['windowswap', '%3p%%'.spc, 'linenr', ':%3v '])
   endif
   if !exists('g:airline_section_error')
-    let g:airline_section_error = airline#section#create(['ycm_error_count'])
+    let g:airline_section_error = airline#section#create(['ycm_error_count', 'syntastic', 'eclim'])
   endif
   if !exists('g:airline_section_warning')
-    let g:airline_section_warning = airline#section#create(['ycm_warning_count', 'syntastic', 'eclim', 'whitespace'])
+    let g:airline_section_warning = airline#section#create(['ycm_warning_count', 'whitespace'])
   endif
 endfunction