Revert KeyError catch for issue #141