Changed except clause back to the way it was