More robust resetting of invalid runtime params