Merge "Avoid exiting when snapshot initialization failed"