Issue #6 Handle DMS not enabled case