Add improved error checking