Fixes #165 Map command should validate args count