merged in mattmerril exception handling
v1.1.7a
merge in mattmerril exception enhancements