fix more bare excepts
Merge pull request #390 from wozz/gtk

Gtk updates
Merge pull request #388 from WyseNynja/fix_more_bare_except

fix more bare excepts
Merge remote-tracking branch 'upstream/master' into clean