Don't allow too many arguments to be sent to the map command (#673)

Don't allow too many arguments to be sent to the map command (#673) #144