never return null
added TODO, corrected name