Exception fixed for #SCL-5026