Add a null check in language