Fix Return Type to Try and Refactoring.