Minor bug fixes

Added deref on collections
Return nil when collection doesn't exist in store