diff --git a/genre.py b/genre.py
index 5f2e05c..832e71d 100644
--- a/genre.py
+++ b/genre.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_genre():
         return render_template("edit_id_name.html", form=form, page_title='Create new Genre' )
     else:
         genre = Genre( name=request.form["name"] )
-        db.session.add(genre)
-        db.session.commit()
-        st.SetMessage( "Created new Genre (id={})".format(genre.id) )
-        return redirect( '/genres' )
+        try:
+            db.session.add(genre)
+            db.session.commit()
+            st.SetMessage( "Created new Genre (id={})".format(genre.id) )
+            return redirect( '/genres' )
+        except SQLAlchemyError as e:
+            st.SetAlert( "danger" )
+            st.SetMessage( "<b>Failed to add Genre:</b>&nbsp;{}".format( e.orig) )
+            return render_template("edit_id_name.html", form=form, page_title='Create new Genre', alert=st.GetAlert(), message=st.GetMessage() )
 
 ################################################################################
 # /genre/<id> -> GET/POST(save or delete) -> shows/edits/delets a single genre
@@ -63,15 +69,20 @@ def genre(id):
     ### DDP: should this be request.form or request.values?
     form = GenreForm(request.form)
     if request.method == 'POST' and form.validate():
-        genre = Genre.query.get(id)
-        if 'delete' in request.form:
-            st.SetMessage("Successfully deleted (id={}, name={})".format( genre.id, genre.name ) )
-            genre = Genre.query.filter(Genre.id==id).delete()
-        if 'submit' in request.form:
-            st.SetMessage("Successfully Updated Genre (id={})".format(id) )
-            genre.name = request.form['name']
-        db.session.commit()
-        return redirect( '/genres' )
+        try:
+            genre = Genre.query.get(id)
+            if 'delete' in request.form:
+                st.SetMessage("Successfully deleted (id={}, name={})".format( genre.id, genre.name ) )
+                genre = Genre.query.filter(Genre.id==id).delete()
+            if 'submit' in request.form:
+                st.SetMessage("Successfully Updated Genre (id={})".format(id) )
+                genre.name = request.form['name']
+            db.session.commit()
+            return redirect( '/genres' )
+        except SQLAlchemyError as e:
+            st.SetAlert( "danger" )
+            st.SetMessage( "<b>Failed to modity Genre:</b>&nbsp;{}".format(e.orig) )
+            return render_template("edit_id_name.html", form=form, page_title='Edit Genre', alert=st.GetAlert(), message=st.GetMessage() )
     else:
         genre = Genre.query.get(id)
         form = GenreForm(request.values, obj=genre)