Fix validation of notification fields

Change-Id: Ia707d5c55a4045cf53cec08b2a8e4e41e50fae76