Fix/3.x/issue 3130

As I talked with @gurbuzali, only Queryable entries are supported since "IllegalArgumentException" will be thrown.
THen I would make that the last call of this function.

The added value of the 'expect' field in a test is imho quite limited. I often place an explicit try catch around a statement so that I exactly know which field is causing it and do some after verifications. In this case the expect is 'fine' but make sure your apply is the last call of the method.