Adding in error handling changes from Brad#4

Open

sbrockman wants to merge 1 commit intobradmann:masterfrom

sbrockman:master

Commits on Sep 13, 2019

Adding in error handling changes from Brad
stevenbrockman
committed