Always return a minion if we have it, so that we don't flakely 404...

Closes #3098 @smarterclayton