Additional null-checks