And probably better error messages in logs