Bugfix: check if argument is null in both converter-methods