fix passing null arguments