refactor: split out resolve handlers in validateEntry