#961 Add new fields for PM support
Add missing errors