diff --git a/controllers/feed.php b/controllers/feed.php
index 7e80278..640844b 100644
--- a/controllers/feed.php
+++ b/controllers/feed.php
@@ -186,8 +186,6 @@ Router\action('subscribe', function () {
     } catch (PicoFeed\Client\InvalidCertificateException $e) {
         $error_message = t('Invalid SSL certificate.');
     } catch (PicoFeed\Client\InvalidUrlException $e) {
-        // picoFeed uses this exception for multiple reasons, but doesn't
-        // provide an exception code to distinguish what exactly happend here
         $error_message = $e->getMessage();
     } catch (PicoFeed\Client\MaxRedirectException $e) {
         $error_message = t('Maximum number of HTTP redirections exceeded.');
diff --git a/lib/helpers.php b/lib/helpers.php
index 839826b..a741472 100644
--- a/lib/helpers.php
+++ b/lib/helpers.php
@@ -81,7 +81,7 @@ function css()
 function get_current_base_url()
 {
     $url = is_secure_connection() ? 'https://' : 'http://';
-    $url .= $_SERVER['SERVER_NAME'];
+    $url .= $_SERVER['HTTP_HOST'];
     $url .= $_SERVER['SERVER_PORT'] == 80 || $_SERVER['SERVER_PORT'] == 443 ? '' : ':'.$_SERVER['SERVER_PORT'];
     $url .= str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])) !== '/' ? str_replace('\\', '/', dirname($_SERVER['PHP_SELF'])).'/' : '/';