diff --git a/HsH-classes.dtx b/HsH-classes.dtx
index 73ded9222be45e8c536a46a773296e1f5c7dd1a3..a0b79d2d828a07bb3567024527e1e036363be550 100644
--- a/HsH-classes.dtx
+++ b/HsH-classes.dtx
@@ -27,7 +27,14 @@
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
-\newcommand{\includeHsHlogohere}[1][5cm]{\includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}}
+\newcommand{\includeHsHlogohere}[1][5cm]{
+  \IfFileExists{\HsHlogoPath}{}{
+    \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
+			The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
+		}
+	}
+  \includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}
+}
 \newif\if@german%
 %<article|report>\newif\if@todos\@todosfalse%
 
@@ -516,11 +523,6 @@
     \global\@topnum=\z@
 %</article>
     \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-    \IfFileExists{\HsHlogoPath}{}{
-      \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
-        The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
-      }
-    }
     \vspace*{1cm}
     \begin{minipage}[t]{\textwidth}%
       \ifx\@titlehead\@empty \else
diff --git a/src/HsH-article.cls b/src/HsH-article.cls
index 9374487d8aa9340bd430ec5dd41df11a97b64356..857ef3a5862f4f500c1b7fc007d72a689d583470 100644
--- a/src/HsH-article.cls
+++ b/src/HsH-article.cls
@@ -28,7 +28,14 @@
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
-\newcommand{\includeHsHlogohere}[1][5cm]{\includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}}
+\newcommand{\includeHsHlogohere}[1][5cm]{
+  \IfFileExists{\HsHlogoPath}{}{
+    \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
+The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
+}
+}
+  \includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}
+}
 \newif\if@german%
 \newif\if@todos\@todosfalse%
 
@@ -351,11 +358,6 @@
     \fi
     \global\@topnum=\z@
     \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-    \IfFileExists{\HsHlogoPath}{}{
-      \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
-        The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
-      }
-    }
     \vspace*{1cm}
     \begin{minipage}[t]{\textwidth}%
       \ifx\@titlehead\@empty \else
diff --git a/src/HsH-report.cls b/src/HsH-report.cls
index 283879443029158d1cd145a2e9bbfdbd5b632403..48147d28bfbe944fbde27dfd8679b01d7ddd5ef9 100644
--- a/src/HsH-report.cls
+++ b/src/HsH-report.cls
@@ -28,7 +28,14 @@
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
-\newcommand{\includeHsHlogohere}[1][5cm]{\includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}}
+\newcommand{\includeHsHlogohere}[1][5cm]{
+  \IfFileExists{\HsHlogoPath}{}{
+    \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
+The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
+}
+}
+  \includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}
+}
 \newif\if@german%
 \newif\if@todos\@todosfalse%
 
@@ -383,11 +390,6 @@
       \next@tdpage
     \fi
     \setparsizes{\z@}{\z@}{\z@\@plus 1fil}\par@updaterelative
-    \IfFileExists{\HsHlogoPath}{}{
-      \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
-        The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
-      }
-    }
     \vspace*{1cm}
     \begin{minipage}[t]{\textwidth}%
       \ifx\@titlehead\@empty \else
diff --git a/src/HsH-standalone.cls b/src/HsH-standalone.cls
index b635ccd3ed858e580579b65a9747dc5d83d30402..72ca4383a61fd84b3eb93d054d2e103185d097ed 100644
--- a/src/HsH-standalone.cls
+++ b/src/HsH-standalone.cls
@@ -28,7 +28,14 @@
 %% commands for HsH-logo
 \newcommand{\HsHlogoPath}{HSH-Logo.pdf}
 \newcommand{\HsHlogoPage}{1}
-\newcommand{\includeHsHlogohere}[1][5cm]{\includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}}
+\newcommand{\includeHsHlogohere}[1][5cm]{
+  \IfFileExists{\HsHlogoPath}{}{
+    \ClassError{\myClassName}{HsH-Logo.pdf not found!}{
+The HsH Logo is necasary for the titlepage! Try putting it next to your source file or use \HsHlogoPath to define the file location
+}
+}
+  \includegraphics[width=#1,page=\HsHlogoPage]{\HsHlogoPath}
+}
 \newif\if@german%
 
 %% document options -------------------------------------------------------------------------------