add waterline-error support