better handling of up/destroy commands