Fix 'Cannot add *: instance is on database 'default', value is on database 'None' error