Futher fix ErrorCode