[DF-None] Memory leak fix. Crash fix.