bugfix null handling