fixed possible NPE
fixed getHash() call with closed DB
Merge branch 'master' into ice-cream-sandwich