Adding checks around added sources