15eeb7e4a8 wasn't cruft; we need to handle an *empty* Subject gracefully, too