Removed free statements in error handling that were not removed earlier
and added a missing return statement
Merge branch 'jason_fru_fix'