Adding some data validation
Merge branch 'blog-feed'