Added state management for failed loads