Add a check on argv argument

[zardus]

Looks reasonable to me! @rhelmot, @fish, any issues off the top of your heads?

[ltfish]

Thanks!