Add more info to source error states