DELTASPIKE-569 Improve DeltaSpikeResourceHandler handling