Better defensive checking around currentSubject