changed Exception to Common