diff --git a/neutron/api/rpc/handlers/dhcp_rpc.py b/neutron/api/rpc/handlers/dhcp_rpc.py
index 353139136d3..1c90a3c8b00 100644
--- a/neutron/api/rpc/handlers/dhcp_rpc.py
+++ b/neutron/api/rpc/handlers/dhcp_rpc.py
@@ -104,6 +104,7 @@ class DhcpRpcCallback(object):
         except (db_exc.DBError,
                 exceptions.NetworkNotFound,
                 exceptions.SubnetNotFound,
+                exceptions.InvalidInput,
                 exceptions.IpAddressGenerationFailure) as e:
             with excutils.save_and_reraise_exception(reraise=False) as ctxt:
                 if isinstance(e, exceptions.IpAddressGenerationFailure):
diff --git a/neutron/tests/unit/api/rpc/handlers/test_dhcp_rpc.py b/neutron/tests/unit/api/rpc/handlers/test_dhcp_rpc.py
index c88f8919d46..28dded5e12d 100644
--- a/neutron/tests/unit/api/rpc/handlers/test_dhcp_rpc.py
+++ b/neutron/tests/unit/api/rpc/handlers/test_dhcp_rpc.py
@@ -157,6 +157,9 @@ class TestDhcpRpcCallback(base.BaseTestCase):
         self._test__port_action_with_failures(
             exc=n_exc.IpAddressGenerationFailure(net_id='foo_network_id'),
             action='create_port')
+        self._test__port_action_with_failures(
+            exc=n_exc.InvalidInput(error_message='sorry'),
+            action='create_port')
 
     def test_get_network_info_return_none_on_not_found(self):
         self.plugin.get_network.side_effect = n_exc.NetworkNotFound(net_id='a')