am ff39d907: Merge "Check command line arguments first."

* commit 'ff39d907ea8765e0a3dd8dff1e79333446bb235c':
  Check command line arguments first.