[FIX] Properly handling errors and successes