Fix Null ref on SQL-only and valid email subjects

This resolves issues raid in #40, with less allocations in most use
cases.
Merge remote-tracking branch 'syncroot/master'