Removed presence check of subject - as it happens earlier in the code anyway