Fix typo, add return statement in exception case
Fix homepage template