Let's catch even more errors