Some nil-safety
Update wat_catcher