merged in mattmerril exception handling