Add error fallback (do not crash application)