Added firmware error handling