Address compiler warnings:

* Add explicit return
* don't use undefined pointer
* Remove empty function body