swc-678 - better error handling
Merge pull request #431 from dburdick/swc-678

swc-678 - better error handling