1151386 - Fix cleanup when DB init goes wrong

In case initialization of __DB fails, we try to delete
__DB2, but that does not exist yet.