--- a/membermap/forms.py	Thu Dec 10 20:57:50 2015 -0600
+++ b/membermap/forms.py	Thu Dec 10 21:11:10 2015 -0600
@@ -3,6 +3,9 @@
 """
 from django import forms
 
+from core.html import ImageCheckError
+from core.html import image_check
+from core.markup import site_markup
 from membermap.models import MapEntry
 
 
@@ -12,6 +15,19 @@
     message = forms.CharField(required=False,
             widget=forms.Textarea(attrs={'class': 'markItUp smileyTarget'}))
 
+    def clean_message(self):
+        message = self.cleaned_data['message']
+        self.html = None
+
+        if message:
+            self.html = site_markup(message)
+            try:
+                image_check(self.html)
+            except ImageCheckError as ex:
+                raise forms.ValidationError(str(ex))
+
+        return message
+
     class Meta:
         model = MapEntry
         fields = ('location', 'message')