diff --git a/app/controllers/accountable_sparklines_controller.rb b/app/controllers/accountable_sparklines_controller.rb
index bebc211f..832b0a09 100644
--- a/app/controllers/accountable_sparklines_controller.rb
+++ b/app/controllers/accountable_sparklines_controller.rb
@@ -17,6 +17,9 @@ class AccountableSparklinesController < ApplicationController
     end
 
     render layout: false
+  rescue => e
+    Rails.logger.error "Accountable sparkline error for #{@accountable&.name}: #{e.message}"
+    render partial: "accountable_sparklines/error", layout: false
   end
 
   private
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb
index 904be2b5..d3fbb00e 100644
--- a/app/controllers/accounts_controller.rb
+++ b/app/controllers/accounts_controller.rb
@@ -24,6 +24,9 @@ class AccountsController < ApplicationController
 
   def sparkline
     render layout: false
+  rescue => e
+    Rails.logger.error "Sparkline error for account #{@account.id}: #{e.message}"
+    render partial: "accounts/sparkline_error", layout: false
   end
 
   private
diff --git a/app/javascript/controllers/turbo_frame_timeout_controller.js b/app/javascript/controllers/turbo_frame_timeout_controller.js
new file mode 100644
index 00000000..a81b3dde
--- /dev/null
+++ b/app/javascript/controllers/turbo_frame_timeout_controller.js
@@ -0,0 +1,42 @@
+import { Controller } from "@hotwired/stimulus"
+
+// Connects to data-controller="turbo-frame-timeout"
+export default class extends Controller {
+  static values = { timeout: { type: Number, default: 10000 } }
+
+  connect() {
+    this.timeoutId = setTimeout(() => {
+      this.handleTimeout()
+    }, this.timeoutValue)
+
+    // Listen for successful frame loads to clear timeout
+    this.element.addEventListener("turbo:frame-load", this.clearTimeout.bind(this))
+  }
+
+  disconnect() {
+    this.clearTimeout()
+  }
+
+  clearTimeout() {
+    if (this.timeoutId) {
+      clearTimeout(this.timeoutId)
+      this.timeoutId = null
+    }
+  }
+
+  handleTimeout() {
+    // Replace loading content with error state
+    this.element.innerHTML = `
+      <div class="flex items-center justify-end gap-1">
+        <div class="w-8 h-4 flex items-center justify-center">
+          <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-warning">
+            <path d="m21.73 18-8-14a2 2 0 0 0-3.48 0l-8 14A2 2 0 0 0 4 21h16a2 2 0 0 0 1.73-3Z"/>
+            <path d="M12 9v4"/>
+            <path d="m12 17 .01 0"/>
+          </svg>
+        </div>
+        <p class="font-mono text-right text-xs text-warning">Timeout</p>
+      </div>
+    `
+  }
+} 
\ No newline at end of file
diff --git a/app/models/account/chartable.rb b/app/models/account/chartable.rb
index 000fc3de..304fcbbd 100644
--- a/app/models/account/chartable.rb
+++ b/app/models/account/chartable.rb
@@ -29,5 +29,15 @@ module Account::Chartable
     Rails.cache.fetch(cache_key) do
       balance_series
     end
+  rescue => e
+    Rails.logger.error "Sparkline series error for account #{id}: #{e.message}"
+    # Return empty series as fallback
+    Series.new(
+      start_date: 30.days.ago.to_date,
+      end_date: Date.current,
+      interval: "1 day",
+      values: [],
+      favorable_direction: favorable_direction
+    )
   end
 end
diff --git a/app/models/balance/chart_series_builder.rb b/app/models/balance/chart_series_builder.rb
index d350b29d..0c367685 100644
--- a/app/models/balance/chart_series_builder.rb
+++ b/app/models/balance/chart_series_builder.rb
@@ -9,14 +9,23 @@ class Balance::ChartSeriesBuilder
 
   def balance_series
     build_series_for(:balance)
+  rescue => e
+    Rails.logger.error "Balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
   end
 
   def cash_balance_series
     build_series_for(:cash_balance)
+  rescue => e
+    Rails.logger.error "Cash balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
   end
 
   def holdings_balance_series
     build_series_for(:holdings_balance)
+  rescue => e
+    Rails.logger.error "Holdings balance series error: #{e.message} for accounts #{@account_ids}"
+    raise
   end
 
   private
@@ -61,6 +70,9 @@ class Balance::ChartSeriesBuilder
           sign_multiplier: sign_multiplier
         }
       ])
+    rescue => e
+      Rails.logger.error "Query data error: #{e.message} for accounts #{account_ids}, period #{period.start_date} to #{period.end_date}"
+      raise
     end
 
     # Since the query aggregates the *net* of assets - liabilities, this means that if we're looking at
diff --git a/app/views/accountable_sparklines/_error.html.erb b/app/views/accountable_sparklines/_error.html.erb
new file mode 100644
index 00000000..70ce745e
--- /dev/null
+++ b/app/views/accountable_sparklines/_error.html.erb
@@ -0,0 +1,8 @@
+<%= turbo_frame_tag "#{params[:accountable_type]}_sparkline" do %>
+  <div class="flex items-center justify-end gap-1">
+    <div class="w-8 h-3 flex items-center justify-center">
+      <%= icon("alert-triangle", size: "sm", class: "text-warning") %>
+    </div>
+    <p class="font-mono text-right text-xs text-warning">Error</p>
+  </div>
+<% end %> 
\ No newline at end of file
diff --git a/app/views/accounts/_accountable_group.html.erb b/app/views/accounts/_accountable_group.html.erb
index b5393856..b4495afc 100644
--- a/app/views/accounts/_accountable_group.html.erb
+++ b/app/views/accounts/_accountable_group.html.erb
@@ -14,7 +14,7 @@
           </div>
         <% else %>
           <%= tag.p format_money(account_group.total_money), class: "text-sm font-medium text-primary" %>
-          <%= turbo_frame_tag "#{account_group.key}_sparkline", src: accountable_sparkline_path(account_group.key), loading: "lazy" do %>
+          <%= turbo_frame_tag "#{account_group.key}_sparkline", src: accountable_sparkline_path(account_group.key), loading: "lazy", data: { controller: "turbo-frame-timeout", turbo_frame_timeout_timeout_value: 10000 } do %>
             <div class="flex items-center w-8 h-4 ml-auto">
               <div class="w-6 h-px bg-loader"></div>
             </div>
@@ -50,7 +50,7 @@
           <% else %>
             <div class="ml-auto text-right grow h-10">
               <%= tag.p format_money(account.balance_money), class: "text-sm font-medium text-primary whitespace-nowrap" %>
-              <%= turbo_frame_tag dom_id(account, :sparkline), src: sparkline_account_path(account), loading: "lazy" do %>
+              <%= turbo_frame_tag dom_id(account, :sparkline), src: sparkline_account_path(account), loading: "lazy", data: { controller: "turbo-frame-timeout", turbo_frame_timeout_timeout_value: 10000 } do %>
                 <div class="flex items-center w-8 h-4 ml-auto">
                   <div class="w-6 h-px bg-loader"></div>
                 </div>
diff --git a/app/views/accounts/_sparkline_error.html.erb b/app/views/accounts/_sparkline_error.html.erb
new file mode 100644
index 00000000..2f813a0d
--- /dev/null
+++ b/app/views/accounts/_sparkline_error.html.erb
@@ -0,0 +1,8 @@
+<%= turbo_frame_tag dom_id(@account, :sparkline) do %>
+  <div class="flex items-center justify-end gap-1">
+    <div class="w-8 h-5 flex items-center justify-center">
+      <%= icon("alert-triangle", size: "sm", class: "text-warning") %>
+    </div>
+    <p class="font-mono text-right text-xs text-warning">Error</p>
+  </div>
+<% end %> 
\ No newline at end of file
diff --git a/test/controllers/accounts_controller_test.rb b/test/controllers/accounts_controller_test.rb
index a3d827e8..e81cf7d0 100644
--- a/test/controllers/accounts_controller_test.rb
+++ b/test/controllers/accounts_controller_test.rb
@@ -6,13 +6,32 @@ class AccountsControllerTest < ActionDispatch::IntegrationTest
     @account = accounts(:depository)
   end
 
-  test "new" do
-    get new_account_path
-    assert_response :ok
+  test "should get index" do
+    get accounts_url
+    assert_response :success
   end
 
-  test "can sync an account" do
-    post sync_account_path(@account)
-    assert_redirected_to account_path(@account)
+  test "should sync account" do
+    post sync_account_url(@account)
+    assert_redirected_to account_url(@account)
+  end
+
+  test "should get chart" do
+    get chart_account_url(@account)
+    assert_response :success
+  end
+
+  test "should get sparkline" do
+    get sparkline_account_url(@account)
+    assert_response :success
+  end
+
+  test "should handle sparkline errors gracefully" do
+    # Mock an error in the sparkline_series method
+    @account.stubs(:sparkline_series).raises(StandardError.new("Test error"))
+
+    get sparkline_account_url(@account)
+    assert_response :success
+    assert_match /Error/, response.body
   end
 end