null-value treating bugfix