Properly call finish in case of error so action doesn't hang
Merge pull request #2 from jwvanderbeck/master

Properly call finish in case of error so action doesn't hang