Bugfix in data unit helpers NPE