* Fix a FIXME. Add some error checking and set the return