diff --git a/poppy/model/ssl_certificate.py b/poppy/model/ssl_certificate.py
index c2b2c9d4..9e1025a1 100644
--- a/poppy/model/ssl_certificate.py
+++ b/poppy/model/ssl_certificate.py
@@ -16,7 +16,7 @@
 from poppy.model import common
 
 
-VALID_CERT_TYPES = [u'san', u'custom']
+VALID_CERT_TYPES = [u'san', u'custom', u'dedicated']
 VALID_STATUS_IN_CERT_DETAIL = [
     u'deployed',
     u'create_in_progress',
diff --git a/poppy/transport/pecan/controllers/v1/admin.py b/poppy/transport/pecan/controllers/v1/admin.py
index 28cb0695..db06bae5 100644
--- a/poppy/transport/pecan/controllers/v1/admin.py
+++ b/poppy/transport/pecan/controllers/v1/admin.py
@@ -70,7 +70,7 @@ class DomainMigrationController(base.Controller, hooks.HookController):
         except errors.ServiceNotFound:
             pecan.abort(404, detail='Service {0} could not be found'.format(
                 service_id))
-        except LookupError:
+        except (LookupError, ValueError):
             pecan.abort(404, detail='Domain {0} could not be found'.format(
                 domain_name))