Patch NPE if no args are passed

Temp fix until looked into more