Fixed bad return statements