NPE during db restore was fixed.