diff --git a/Changelog b/Changelog
index 573aa9504..cef673cf3 100644
--- a/Changelog
+++ b/Changelog
@@ -3,6 +3,7 @@
     torrent is really complete (closes #674349)
     - BUGFIX: Fix possible incorrect behavior with queueing
     - BUGFIX: Fix RSS refresh interval saving
+    - BUGFIX: Fix possible crash when setting RSS proxy (closes #676288)
 
 * Wed Nov 10 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.4.10
     - BUGFIX: Fix possible crash when selecting a RSS item (really closes #575624)
diff --git a/src/cookiesdlg.cpp b/src/cookiesdlg.cpp
index f40c2df6a..47e0baaaa 100644
--- a/src/cookiesdlg.cpp
+++ b/src/cookiesdlg.cpp
@@ -73,8 +73,12 @@ void CookiesDlg::on_del_btn_clicked() {
 QList<QByteArray> CookiesDlg::getCookies() const {
   QList<QByteArray> ret;
   for(int i=0; i<ui->cookiesTable->rowCount(); ++i) {
-    QString key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed();
-    QString value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed();
+    QString key;
+    if(ui->cookiesTable->item(i, COOKIE_KEY))
+      key = ui->cookiesTable->item(i, COOKIE_KEY)->text().trimmed();
+    QString value;
+    if(ui->cookiesTable->item(i, COOKIE_VALUE))
+      value = ui->cookiesTable->item(i, COOKIE_VALUE)->text().trimmed();
     if(!key.isEmpty() && !value.isEmpty()) {
       const QString raw_cookie = key+"="+value;
       qDebug("Cookie: %s", qPrintable(raw_cookie));