diff --git a/fedocal/__init__.py b/fedocal/__init__.py
index cf590977..eacf31e9 100644
--- a/fedocal/__init__.py
+++ b/fedocal/__init__.py
@@ -706,6 +706,11 @@ def delete_meeting(meeting_id):
         return flask.redirect(flask.url_for('index'))
     meeting = Meeting.by_id(SESSION, meeting_id)
 
+    if not meeting:
+        flask.flash(
+            'No meeting with this identifier could be found.', 'errors')
+        return flask.redirect(flask.url_for('index'))
+
     if meeting.calendar.calendar_status != 'Enabled':
         flask.flash('This calendar is "%s", you are not allowed to delete '
                     'its meetings anymore.' % (
@@ -734,13 +739,15 @@ def delete_meeting(meeting_id):
                 fedocallib.delete_recursive_meeting(SESSION, meeting)
             else:
                 meeting.delete(SESSION)
+
             try:
                 SESSION.commit()
+                flask.flash('Meeting deleted')
             except SQLAlchemyError, err:
                 SESSION.rollback()
                 print 'edit_meeting:', err
-                flask.flash('Could not update this meeting.', 'error')
-        flask.flash('Meeting deleted')
+                flask.flash('Could not delete this meeting.', 'error')
+
         fedmsg.publish(topic="meeting.delete", msg=dict(
             agent=flask.g.fas_user.username,
             meeting=meeting.to_json(),
diff --git a/fedocal/templates/default/delete_meeting.html b/fedocal/templates/default/delete_meeting.html
index c17bfc68..fe46cc4a 100644
--- a/fedocal/templates/default/delete_meeting.html
+++ b/fedocal/templates/default/delete_meeting.html
@@ -32,10 +32,29 @@ <h4> Meeting: {{ meeting.meeting_name}}</h4>
 {{ render_field_invert(form.confirm_futher_delete) }}
 {% endif %}
 <p class="buttons indent">
-    <input type="submit" class="submit positive button" value="Delete">
+    <input id="confirm_button" type="submit" class="submit positive button"
+           value="Delete" disabled="disabled">
     <input type="button" value="Cancel" class="button" onclick="history.back();">
 </p>
 {{ form.csrf_token }}
 </form>
 
 {% endblock %}
+
+{% block jscripts %}
+{{ super() }}
+<script type="text/javascript">
+   $(document).ready(function() {
+     $('#confirm_delete').click(function() {
+        var cb = $('#confirm_button');
+        if(this.checked == true) {
+           cb.removeAttr('disabled');
+           cb.removeClass('ui-state-disabled')
+        } else {
+           cb.attr('disabled', true);
+           cb.addClass('ui-state-disabled')
+        }
+     });
+ });
+</script>
+{% endblock %}