Added case for logging before return statements; fish compiles with these changes