Check for null value instead of empty value

The empty check is breaking messaging, which allows for (and sometimes require) empty message param value