[MR] {bugfix} prevent illegalstateexception