Fix NPE with missing expiry or notify attribute