Illegal patch from service

Test and fix for IllegalArgumentException when applying a change.