Return if no result from mapping
Add logging