"Robusted the error handling"