Add error verification