null-check-added