Added error handling methods