Add sample name to exception.
Update samples.py with scratch samples.