Perhaps it's worth addressing this TODO?  If not, then it should be cleaned up style-wise:

1) move the TODO comment before the "if"
2) get rid of the braces
3) change the DBG to an ofono_error()