[error] Error handling fix from martyone