NTFY-22 Replaced function with return value with callback in order to distinguish between illegal Origin field and non-existent one