Catch errors and remove temp.py file for better command line experience.
Merge changes.