DDF-7 Addressed review comments - CloseQuietly and returning empty map instead of null.