Added ._error state
Never got used to merge conflicts