diff --git a/templates/dynmotd b/templates/dynmotd
index 815f31b..4ca5a26 100644
--- a/templates/dynmotd
+++ b/templates/dynmotd
@@ -87,9 +87,12 @@ echo -e "
 {% if ansible_virtualization_type != "lxc" %}
  $COLOR_COLUMN- Disk space$RESET_COLORS..........: "
 for FS in ${FILESYSTEMS}; do
-echo -e " $COLOR_COLUMN- ..........$RESET_COLORS..........: $COLOR_VALUE `df -H ${FS} | grep -v 'Filesystem' | grep -v '^[[:space:]]*$' | awk '{print $6 " " $4}'` remaining $RESET_COLORS"
+echo -e " $COLOR_COLUMN- ..........$RESET_COLORS..........: $COLOR_VALUE `df -H ${FS} | grep -v 'Filesystem' | grep -v '^[[:space:]]*$' | awk '{print $6 \" \" $4}'` remaining $RESET_COLORS"
 done
 {% endif %}
+echo -e "
 ===========================================================================
-`/usr/bin/env cat /etc/motd`
-"
\ No newline at end of file
+"
+if [ -f /etc/motd ]; then
+ `/usr/bin/env cat /etc/motd`
+fi
\ No newline at end of file