Refactor, renaming else function to catch