diff --git a/moderncv.cls b/moderncv.cls
index 654fc00..015704a 100644
--- a/moderncv.cls
+++ b/moderncv.cls
@@ -370,11 +370,11 @@
 \newcommand*{\cventry}[6]{%
   \cvline{#1}{%
     {\bfseries#2}%
-    \ifx#3\else{, {\slshape#3}}\fi%
-    \ifx#4\else{, #4}\fi%
-    \ifx#5\else{, #5}\fi%
+    \ifx{#3}\empty\else{, {\slshape#3}}\fi%
+    \ifx{#4}\empty\else{, #4}\fi%
+    \ifx{#5}\empty\else{, #5}\fi%
     .%
-    \ifx#6\else{\newline{}\begin{minipage}[t]{\linewidth}\small#6\end{minipage}}\fi
+    \ifx{#6}\empty\else{\newline{}\begin{minipage}[t]{\linewidth}\small#6\end{minipage}}\fi
     }}%
 
 % usage (inside 'language' cvsection environment): \cvlanguage{name}{level}{comment}