Merge "[pm] better error message for debugging" into main