Add even more error checking...