diff --git a/XilinxProcessorIPLib/drivers/axiethernet/data/axiethernet.tcl b/XilinxProcessorIPLib/drivers/axiethernet/data/axiethernet.tcl
index 1cf36fdc..a18057e5 100755
--- a/XilinxProcessorIPLib/drivers/axiethernet/data/axiethernet.tcl
+++ b/XilinxProcessorIPLib/drivers/axiethernet/data/axiethernet.tcl
@@ -224,6 +224,10 @@ proc xdefine_axi_target_params {periphs file_handle} {
 		    # FIFO Interrupts Handling
 			set int_pin [get_pins -of_objects [get_cells -hier $tartget_per_name] INTERRUPT]
 			set intc_periph_type [::hsi::utils::get_connected_intr_cntrl $tartget_per_name $int_pin]
+                        if { $intc_periph_type == ""} {
+                                puts "Info: FIFO interrupt not connected to intc\n"
+                                return
+                        }
 			set intc_name [get_property IP_NAME $intc_periph_type]
 		       if { $intc_name != [format "ps7_scugic"] } {
 				set int_id [::hsi::utils::get_port_intr_id [get_cells -hier $tartget_per_name] $int_pin]
diff --git a/XilinxProcessorIPLib/drivers/axiethernet/src/xaxiethernet.h b/XilinxProcessorIPLib/drivers/axiethernet/src/xaxiethernet.h
index a09badf1..6c9722c8 100644
--- a/XilinxProcessorIPLib/drivers/axiethernet/src/xaxiethernet.h
+++ b/XilinxProcessorIPLib/drivers/axiethernet/src/xaxiethernet.h
@@ -461,6 +461,8 @@
 *		      Axi stream fifo (CR 835605). Changes are made in the
 *		      driver tcl file.
 * 5.0  adk 13/06/15 - Updated the driver tcl for Hier IP(To support User parameters).
+* 5.0  adk 28/07/15 - Fixed CR:870631 AXI Ethernet with FIFO will fail to
+*		      Create the BSP if the interrupt pin on the FIFO is unconnected
 * </pre>
 *
 ******************************************************************************/