fixed added zero check with is null