Added some maintenance code to prevent null entries from fucking up our shit