Add validation to avoid notice in pm tables