Added check for override command-line parameter.