Exception handling when tracking snapshots

Exception handling when tracking snapshots