83195280 - handle missing parameters better