[FIX] Cleaned up error logging