A nil-value is no longer simply passed through, so this has to do some "special things" to work properly. Signed-off-by: Uli Schlachter <psychon@znc.in>
Signed-off-b: Julian Wollrath <jwollrath@web.de>