Get rid of a full except; not tested yet

I haven't tested this - if you read it and it looks plausible, leave a comment saying so.

I'll try it out before merging.