Add missing return
Adjust error message