[PD] Trying to fix error messages