exception in source fixes