Added validation, checking for invalid snapshots