Avoid None parsing member data

Change-Id: I508353990f67fce641f409c204e6d1c5dea3b5da