51373893 source validation change

https://www.pivotaltracker.com/story/show/51373893