Increased strictness of parameter passing.
Fixed bug with missing parameter parsing.