DEV: Avoid nil custom fields (PR #24)

GitHub