catch some illegal command line parameter combinations (based on report by Lina Weichbrodt

Conflicts:

	doc/Changes