Only change option if option is not None