Avoid useless null-check