NullPointerException fix

The following fix will make sure that the additional options, when null, do not cause an NPE exception and is not added along with the other arguments, if there are no options to pass along.