It would be good to catch errors in this and line 89.