null-checks-added