Minor fix for DeviceServerCommandHandler