Bug fix - avoid using datastore when running under naviserver