CLJS upgrade and exception fixing