diff --git a/README.md b/README.md
index 41013293c930aa0f63efdac72ea53c86665fa497..ee35ebd744d40e8eb0919d1cb2f2d8bbaa8a1597 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 osTicket
 ========
-<a href="http://osticket.com"><img src="http://osticket.com/sites/default/files/osTicket.jpg"
+<a href="https://osticket.com"><img height="80px" width="80px" src="images/favicon.png"
 align="left" hspace="10" vspace="6"></a>
 
 **osTicket** is a widely-used open source support ticket system. It seamlessly
diff --git a/images/favicon.png b/images/favicon.png
new file mode 100755
index 0000000000000000000000000000000000000000..c1664259da4804efe7ff9f65f56cfaaa7ad3fae3
Binary files /dev/null and b/images/favicon.png differ
diff --git a/include/class.error.php b/include/class.error.php
index c083437d879e0719582d65d6ce5807e89a424219..e34259529be8798600da28bae200b0970ffdb829 100644
--- a/include/class.error.php
+++ b/include/class.error.php
@@ -25,12 +25,15 @@ class BaseError extends Exception {
         global $ost;
 
         parent::__construct(__($message));
-        $message = str_replace(ROOT_DIR, '(root)/', _S($message));
 
-        if ($ost && $ost->getConfig()->getLogLevel() == 3)
-            $message .= "\n\n" . $this->getBacktrace();
+        if ($ost) {
+            $message = str_replace(ROOT_DIR, '(root)/', _S($message));
 
-        $ost->logError($this->getTitle(), $message, static::$sendAlert);
+            if ($ost->getConfig()->getLogLevel() == 3)
+                $message .= "\n\n" . $this->getBacktrace();
+
+            $ost->logError($this->getTitle(), $message, static::$sendAlert);
+        }
     }
 
     function getTitle() {