fix #1544: null check customField