Updated to make sure no new errors show up now that it has been tested
on the live server.