Bug fix for nil mappings getting passed to the API