Add null-check