diff --git a/autoload/sw/report.vim b/autoload/sw/report.vim
index 50503f5dec5ea3ad9138d179e77c4a14eabc2e5f..7182329fd774973e438a5542840dc9a87c9cabea 100644
--- a/autoload/sw/report.vim
+++ b/autoload/sw/report.vim
@@ -131,7 +131,7 @@ function! sw#report#profile_changed(args)
     let s:in_event = 1
     let profiles = sw#cache_get('profiles')
     let profile = a:args['profile']
-    if has_key(profiles[profile]['props'], 'report') && profiles[profile]['props']['report'] == 'true'
+    if has_key(profiles, profile) && has_key(profiles[profile]['props'], 'report') && profiles[profile]['props']['report'] == 'true'
         call sw#report#get(profile)
     endif
     let s:in_event = 0
diff --git a/autoload/sw/server.vim b/autoload/sw/server.vim
index e9eabf267e2c8d9ce6b8f8c8d7101f6d5d897bf8..26bef3cc9b1bedc9129a6ea055f2f62e40f2d0da 100644
--- a/autoload/sw/server.vim
+++ b/autoload/sw/server.vim
@@ -225,7 +225,8 @@ function! s:try_wbconnect_extract(sql)
         let group = substitute(a:sql, pgroup, '\5', 'g')
     endif
 
-    return {'profile': profile, 'group': group}
+    let _p = '\v;[ \t]*$'
+    return {'profile': substitute(profile, _p, '', 'g'), 'group': substitute(group, _p, '', 'g')}
 endfunction
 
 function! sw#server#execute_sql(sql, ...)