Moved 'success' message into the begin block so it doesn't get printed if there's an error
Merge pull request #933 from awesometown/master

Moved 'success' message into the begin block so it doesn't get printed if there's an error