Fix EC issue on Fedora 20

Fix for #1143
There definitely shouldn't be this much stuff inside a `try:` block, moreover it looks like there's a single `raise` point which gets here, and this could just be written as a `return`?