Merge "bugfix: E722 do not use bare except"