Adding None check on snapshot access