More error checking...