#19 Remove null check not needed arround the mapping body
Remove warnings