More safety for parameter dictionary routine. Related to #880