Added more error handling.
-ININ.