A little bit more for #55
And a light move for empty classes and IDs from errors to advices.