Moved configuration to arguments, so it can be changed from the command line.
This is no longer needed.
This little extra check won't hurt.