Merge pull request #18 from waltzio/feature-errorCatching

Feature error catching
somehow I changed the script.  My bad