Component fix
Improved error handling