Merge with master
Improve the messaging on a null-subject passed in to OptionalSubject