diff --git a/assets/js/admin/wc-enhanced-select.js b/assets/js/admin/wc-enhanced-select.js
index 4379731c339..c208c73b277 100644
--- a/assets/js/admin/wc-enhanced-select.js
+++ b/assets/js/admin/wc-enhanced-select.js
@@ -46,168 +46,173 @@ jQuery( function( $ ) {
 		};
 	}
 
-	$( document.body )
+	try {
+		$( document.body )
 
-		.on( 'wc-enhanced-select-init', function() {
+			.on( 'wc-enhanced-select-init', function() {
 
-			// Regular select boxes
-			$( ':input.wc-enhanced-select, :input.chosen_select' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = $.extend({
-					minimumResultsForSearch: 10,
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' )
-				}, getEnhancedSelectFormatString() );
+				// Regular select boxes
+				$( ':input.wc-enhanced-select, :input.chosen_select' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = $.extend({
+						minimumResultsForSearch: 10,
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' )
+					}, getEnhancedSelectFormatString() );
 
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+				});
 
-			$( ':input.wc-enhanced-select-nostd, :input.chosen_select_nostd' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = $.extend({
-					minimumResultsForSearch: 10,
-					allowClear:  true,
-					placeholder: $( this ).data( 'placeholder' )
-				}, getEnhancedSelectFormatString() );
+				$( ':input.wc-enhanced-select-nostd, :input.chosen_select_nostd' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = $.extend({
+						minimumResultsForSearch: 10,
+						allowClear:  true,
+						placeholder: $( this ).data( 'placeholder' )
+					}, getEnhancedSelectFormatString() );
 
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-			});
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+				});
 
-			// Ajax product search box
-			$( ':input.wc-product-search' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = {
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' ),
-					minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
-					escapeMarkup: function( m ) {
-						return m;
-					},
-					ajax: {
-						url:         wc_enhanced_select_params.ajax_url,
-						dataType:    'json',
-						quietMillis: 250,
-						data: function( params ) {
-							return {
-								term:     params.term,
-								action:   $( this ).data( 'action' ) || 'woocommerce_json_search_products_and_variations',
-								security: wc_enhanced_select_params.search_products_nonce,
-								exclude:  $( this ).data( 'exclude' ),
-								include:  $( this ).data( 'include' ),
-								limit:    $( this ).data( 'limit' )
-							};
+				// Ajax product search box
+				$( ':input.wc-product-search' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = {
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' ),
+						minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
+						escapeMarkup: function( m ) {
+							return m;
 						},
-						processResults: function( data ) {
-							var terms = [];
-							if ( data ) {
-								$.each( data, function( id, text ) {
-									terms.push( { id: id, text: text } );
-								});
-							}
-							return {
-								results: terms
-							};
-						},
-						cache: true
-					}
-				};
-
-				select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
-
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-
-				if ( $( this ).data( 'sortable' ) ) {
-					var $select = $(this);
-					var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
-
-					$list.sortable({
-						placeholder : 'ui-state-highlight select2-selection__choice',
-						forcePlaceholderSize: true,
-						items       : 'li:not(.select2-search__field)',
-						tolerance   : 'pointer',
-						stop: function() {
-							$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
-								var id     = $( this ).data( 'data' ).id;
-								var option = $select.find( 'option[value="' + id + '"]' )[0];
-								$select.prepend( option );
-							} );
-						}
-					});
-				}
-			});
-
-			// Ajax customer search boxes
-			$( ':input.wc-customer-search' ).filter( ':not(.enhanced)' ).each( function() {
-				var select2_args = {
-					allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
-					placeholder: $( this ).data( 'placeholder' ),
-					minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
-					escapeMarkup: function( m ) {
-						return m;
-					},
-					ajax: {
-						url:         wc_enhanced_select_params.ajax_url,
-						dataType:    'json',
-						quietMillis: 250,
-						data: function( params ) {
-							return {
-								term:     params.term,
-								action:   'woocommerce_json_search_customers',
-								security: wc_enhanced_select_params.search_customers_nonce,
-								exclude:  $( this ).data( 'exclude' )
-							};
-						},
-						processResults: function( data ) {
-							var terms = [];
-							if ( data ) {
-								$.each( data, function( id, text ) {
-									terms.push({
-										id: id,
-										text: text
+						ajax: {
+							url:         wc_enhanced_select_params.ajax_url,
+							dataType:    'json',
+							quietMillis: 250,
+							data: function( params ) {
+								return {
+									term:     params.term,
+									action:   $( this ).data( 'action' ) || 'woocommerce_json_search_products_and_variations',
+									security: wc_enhanced_select_params.search_products_nonce,
+									exclude:  $( this ).data( 'exclude' ),
+									include:  $( this ).data( 'include' ),
+									limit:    $( this ).data( 'limit' )
+								};
+							},
+							processResults: function( data ) {
+								var terms = [];
+								if ( data ) {
+									$.each( data, function( id, text ) {
+										terms.push( { id: id, text: text } );
 									});
-								});
-							}
-							return {
-								results: terms
-							};
-						},
-						cache: true
-					}
-				};
-
-				select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
-
-				$( this ).select2( select2_args ).addClass( 'enhanced' );
-
-				if ( $( this ).data( 'sortable' ) ) {
-					var $select = $(this);
-					var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
-
-					$list.sortable({
-						placeholder : 'ui-state-highlight select2-selection__choice',
-						forcePlaceholderSize: true,
-						items       : 'li:not(.select2-search__field)',
-						tolerance   : 'pointer',
-						stop: function() {
-							$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
-								var id     = $( this ).data( 'data' ).id;
-								var option = $select.find( 'option[value="' + id + '"]' )[0];
-								$select.prepend( option );
-							} );
+								}
+								return {
+									results: terms
+								};
+							},
+							cache: true
 						}
-					});
-				}
-			});
-		})
+					};
 
-		// WooCommerce Backbone Modal
-		.on( 'wc_backbone_modal_before_remove', function() {
-			$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
-		})
+					select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
 
-		.trigger( 'wc-enhanced-select-init' );
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
 
-	$( 'html' ).on( 'click', function( event ) {
-		if ( this === event.target ) {
-			$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
-		}
-	} );
+					if ( $( this ).data( 'sortable' ) ) {
+						var $select = $(this);
+						var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
 
+						$list.sortable({
+							placeholder : 'ui-state-highlight select2-selection__choice',
+							forcePlaceholderSize: true,
+							items       : 'li:not(.select2-search__field)',
+							tolerance   : 'pointer',
+							stop: function() {
+								$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
+									var id     = $( this ).data( 'data' ).id;
+									var option = $select.find( 'option[value="' + id + '"]' )[0];
+									$select.prepend( option );
+								} );
+							}
+						});
+					}
+				});
+
+				// Ajax customer search boxes
+				$( ':input.wc-customer-search' ).filter( ':not(.enhanced)' ).each( function() {
+					var select2_args = {
+						allowClear:  $( this ).data( 'allow_clear' ) ? true : false,
+						placeholder: $( this ).data( 'placeholder' ),
+						minimumInputLength: $( this ).data( 'minimum_input_length' ) ? $( this ).data( 'minimum_input_length' ) : '3',
+						escapeMarkup: function( m ) {
+							return m;
+						},
+						ajax: {
+							url:         wc_enhanced_select_params.ajax_url,
+							dataType:    'json',
+							quietMillis: 250,
+							data: function( params ) {
+								return {
+									term:     params.term,
+									action:   'woocommerce_json_search_customers',
+									security: wc_enhanced_select_params.search_customers_nonce,
+									exclude:  $( this ).data( 'exclude' )
+								};
+							},
+							processResults: function( data ) {
+								var terms = [];
+								if ( data ) {
+									$.each( data, function( id, text ) {
+										terms.push({
+											id: id,
+											text: text
+										});
+									});
+								}
+								return {
+									results: terms
+								};
+							},
+							cache: true
+						}
+					};
+
+					select2_args = $.extend( select2_args, getEnhancedSelectFormatString() );
+
+					$( this ).select2( select2_args ).addClass( 'enhanced' );
+
+					if ( $( this ).data( 'sortable' ) ) {
+						var $select = $(this);
+						var $list   = $( this ).next( '.select2-container' ).find( 'ul.select2-selection__rendered' );
+
+						$list.sortable({
+							placeholder : 'ui-state-highlight select2-selection__choice',
+							forcePlaceholderSize: true,
+							items       : 'li:not(.select2-search__field)',
+							tolerance   : 'pointer',
+							stop: function() {
+								$( $list.find( '.select2-selection__choice' ).get().reverse() ).each( function() {
+									var id     = $( this ).data( 'data' ).id;
+									var option = $select.find( 'option[value="' + id + '"]' )[0];
+									$select.prepend( option );
+								} );
+							}
+						});
+					}
+				});
+			})
+
+			// WooCommerce Backbone Modal
+			.on( 'wc_backbone_modal_before_remove', function() {
+				$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
+			})
+
+			.trigger( 'wc-enhanced-select-init' );
+
+		$( 'html' ).on( 'click', function( event ) {
+			if ( this === event.target ) {
+				$( '.wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search' ).filter( '.select2-hidden-accessible' ).select2( 'close' );
+			}
+		} );
+
+	} catch( err ) {
+		// If select2 failed (conflict?) log the error but don't stop other scripts breaking.
+		window.console.log( err );
+	}
 });
diff --git a/assets/js/admin/wc-enhanced-select.min.js b/assets/js/admin/wc-enhanced-select.min.js
index 437a454478a..75a98bf2eba 100644
--- a/assets/js/admin/wc-enhanced-select.min.js
+++ b/assets/js/admin/wc-enhanced-select.min.js
@@ -1 +1 @@
-jQuery(function(a){function b(){return{language:{errorLoading:function(){return wc_enhanced_select_params.i18n_searching},inputTooLong:function(a){var b=a.input.length-a.maximum;return 1===b?wc_enhanced_select_params.i18n_input_too_long_1:wc_enhanced_select_params.i18n_input_too_long_n.replace("%qty%",b)},inputTooShort:function(a){var b=a.minimum-a.input.length;return 1===b?wc_enhanced_select_params.i18n_input_too_short_1:wc_enhanced_select_params.i18n_input_too_short_n.replace("%qty%",b)},loadingMore:function(){return wc_enhanced_select_params.i18n_load_more},maximumSelected:function(a){return 1===a.maximum?wc_enhanced_select_params.i18n_selection_too_long_1:wc_enhanced_select_params.i18n_selection_too_long_n.replace("%qty%",a.maximum)},noResults:function(){return wc_enhanced_select_params.i18n_no_matches},searching:function(){return wc_enhanced_select_params.i18n_searching}}}}a(document.body).on("wc-enhanced-select-init",function(){a(":input.wc-enhanced-select, :input.chosen_select").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-enhanced-select-nostd, :input.chosen_select_nostd").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!0,placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-product-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(b){return{term:b.term,action:a(this).data("action")||"woocommerce_json_search_products_and_variations",security:wc_enhanced_select_params.search_products_nonce,exclude:a(this).data("exclude"),include:a(this).data("include"),limit:a(this).data("limit")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}}),a(":input.wc-customer-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(b){return{term:b.term,action:"woocommerce_json_search_customers",security:wc_enhanced_select_params.search_customers_nonce,exclude:a(this).data("exclude")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}})}).on("wc_backbone_modal_before_remove",function(){a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")}).trigger("wc-enhanced-select-init"),a("html").on("click",function(b){this===b.target&&a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")})});
\ No newline at end of file
+jQuery(function(a){function b(){return{language:{errorLoading:function(){return wc_enhanced_select_params.i18n_searching},inputTooLong:function(a){var b=a.input.length-a.maximum;return 1===b?wc_enhanced_select_params.i18n_input_too_long_1:wc_enhanced_select_params.i18n_input_too_long_n.replace("%qty%",b)},inputTooShort:function(a){var b=a.minimum-a.input.length;return 1===b?wc_enhanced_select_params.i18n_input_too_short_1:wc_enhanced_select_params.i18n_input_too_short_n.replace("%qty%",b)},loadingMore:function(){return wc_enhanced_select_params.i18n_load_more},maximumSelected:function(a){return 1===a.maximum?wc_enhanced_select_params.i18n_selection_too_long_1:wc_enhanced_select_params.i18n_selection_too_long_n.replace("%qty%",a.maximum)},noResults:function(){return wc_enhanced_select_params.i18n_no_matches},searching:function(){return wc_enhanced_select_params.i18n_searching}}}}try{a(document.body).on("wc-enhanced-select-init",function(){a(":input.wc-enhanced-select, :input.chosen_select").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-enhanced-select-nostd, :input.chosen_select_nostd").filter(":not(.enhanced)").each(function(){var c=a.extend({minimumResultsForSearch:10,allowClear:!0,placeholder:a(this).data("placeholder")},b());a(this).select2(c).addClass("enhanced")}),a(":input.wc-product-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(b){return{term:b.term,action:a(this).data("action")||"woocommerce_json_search_products_and_variations",security:wc_enhanced_select_params.search_products_nonce,exclude:a(this).data("exclude"),include:a(this).data("include"),limit:a(this).data("limit")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}}),a(":input.wc-customer-search").filter(":not(.enhanced)").each(function(){var c={allowClear:!!a(this).data("allow_clear"),placeholder:a(this).data("placeholder"),minimumInputLength:a(this).data("minimum_input_length")?a(this).data("minimum_input_length"):"3",escapeMarkup:function(a){return a},ajax:{url:wc_enhanced_select_params.ajax_url,dataType:"json",quietMillis:250,data:function(b){return{term:b.term,action:"woocommerce_json_search_customers",security:wc_enhanced_select_params.search_customers_nonce,exclude:a(this).data("exclude")}},processResults:function(b){var c=[];return b&&a.each(b,function(a,b){c.push({id:a,text:b})}),{results:c}},cache:!0}};if(c=a.extend(c,b()),a(this).select2(c).addClass("enhanced"),a(this).data("sortable")){var d=a(this),e=a(this).next(".select2-container").find("ul.select2-selection__rendered");e.sortable({placeholder:"ui-state-highlight select2-selection__choice",forcePlaceholderSize:!0,items:"li:not(.select2-search__field)",tolerance:"pointer",stop:function(){a(e.find(".select2-selection__choice").get().reverse()).each(function(){var b=a(this).data("data").id,c=d.find('option[value="'+b+'"]')[0];d.prepend(c)})}})}})}).on("wc_backbone_modal_before_remove",function(){a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")}).trigger("wc-enhanced-select-init"),a("html").on("click",function(b){this===b.target&&a(".wc-enhanced-select, :input.wc-product-search, :input.wc-customer-search").filter(".select2-hidden-accessible").select2("close")})}catch(a){window.console.log(a)}});
\ No newline at end of file