Improve binding error checking