[master] Catch errors