Update throw and assert macro

Update throw and assert macro #162