Minor changes

* Added error message when deploy/upgrade fails

* By default, put upgrade_dir in /tmp