Add an explicit null-check