* Revised error handling