Fix #1 if extras has null in value or key