Fixed NULL handling