Fix REST handler to not try to fill a non-struct