Failure state trumps empty state
Merge pull request #98 from guardian/comment-error-and-2267

Failure state trumps empty state