add more waterline-errors support