Add NULL checks from master