Added error checking to 2.6.