Added null check to getMessageSelector - basically ability to not add recipient properties.