helped app fail gracefully in several parts. handles option changes better now