quick fix handle null param