Further error handling additions.
Merge pull request #14 from nierajsingh/cf-deploy

Further error handling additions.