More error status checking, still not complete.