Bug fix in processing input arguments

This release fixes a bug that can potentially lead to null pointer dereference while processing input arguments.