:thumbsup: 
added `return null unless data`