[pl] fix false alarms, detect more error variants