DEV: Avoid nil custom fields (PR #28)

GitHub

Looks good