Even more error checking