Getting rid of the NoneType errors on startup.