Refactor mug property change handler

Split handler so change can be prevented.