Fix minor bug with null/undefined arguments
Update version