Improved DefaultGraphSubjects null-check and unit tests