Adding some preliminary component error handling.