changing error structure a little