Handle empty commands better.