Swc 1696 new b

also include caught.getMessage()