Can you change '!= null' to StringUtils.notBlank()? This way we can prevent that accidentally setting the global email to empty string stops emails to be sent.