Remove deadcode identified by findbugs
Correctly handle nullable parametter