v1.6.2 Make sure we're not saving the db to 'None'