#CO-31 Exception fixed