Fix #102 - Solves null checking of wrong object inside a helper method.