Remove annoying null exception.