Merge "Avoid fatal error if doing a DB query after close()"