yep it could be a solution as well but it's a private method so I prefered to add null everywhere (easy with intellij) instead of adding a new method.