Add more stringent error checking for USB