Merge "Handle exception upgrading to db version 65 gracefully."