diff --git a/condition.py b/condition.py
index 68c3823..9377688 100644
--- a/condition.py
+++ b/condition.py
@@ -3,6 +3,7 @@ from flask import request, render_template, redirect
 from flask_wtf import FlaskForm
 from __main__ import db, app, ma
 from sqlalchemy import func, Sequence
+from sqlalchemy.exc import SQLAlchemyError
 from status import st, Status
 
 ################################################################################
@@ -50,10 +51,15 @@ def new_condition():
         return render_template("edit_id_name.html", form=form, page_title='Create new Condition' )
     else:
         condition = Condition( name=request.form["name"] )
-        db.session.add(condition)
-        db.session.commit()
-        st.SetMessage( "Created new Condition (id={})".format(condition.id) )
-        return redirect( '/conditions' )
+        try:
+            db.session.add(condition)
+            db.session.commit()
+            st.SetMessage( "Created new Condition (id={})".format(condition.id) )
+            return redirect( '/conditions' )
+        except SQLAlchemyError as e:
+            st.SetAlert( "danger" )
+            st.SetMessage( "<b>Failed to add condition:</b>&nbsp;{}".format( e.orig) )
+            return render_template("edit_id_name.html", form=form, page_title='Create new Condition', alert=st.GetAlert(), message=st.GetMessage() )
 
 ################################################################################
 # /condition/<id> -> GET/POST(save or delete) -> shows/edits/delets a single condition
@@ -63,15 +69,20 @@ def condition(id):
     ### DDP: should this be request.form or request.values?
     form = ConditionForm(request.form)
     if request.method == 'POST' and form.validate():
-        condition = Condition.query.get(id)
-        if 'delete' in request.form:
-            st.SetMessage("Successfully deleted (id={}, name={})".format( condition.id, condition.name ) )
-            condition = Condition.query.filter(Condition.id==id).delete()
-        if 'submit' in request.form:
-            st.SetMessage("Successfully Updated Condition (id={})".format(id) )
-            condition.name = request.form['name']
-        db.session.commit()
-        return redirect( '/conditions' )
+        try:
+            condition = Condition.query.get(id)
+            if 'delete' in request.form:
+                st.SetMessage("Successfully deleted (id={}, name={})".format( condition.id, condition.name ) )
+                condition = Condition.query.filter(Condition.id==id).delete()
+            if 'submit' in request.form:
+                st.SetMessage("Successfully Updated Condition (id={})".format(id) )
+                condition.name = request.form['name']
+            db.session.commit()
+            return redirect( '/conditions' )
+        except SQLAlchemyError as e:
+            st.SetAlert( "danger" )
+            st.SetMessage( "<b>Failed to modity condition:</b>&nbsp;{}".format(e.orig) )
+            return render_template("edit_id_name.html", form=form, page_title='Edit Condition', alert=st.GetAlert(), message=st.GetMessage() ) 
     else:
         condition = Condition.query.get(id)
         form = ConditionForm(request.values, obj=condition)