Fix an NPE with DSUs