Import of r39704 from trunk. Avoid buffer underrun on empty commands (e.g. '@'-cancelled ones)
Changed paths: