Do you think you could add the length check in this pull request?