Pass around an extra table to the default handler
Add failure tests