Fix empty command handling