I will let the Try/Catch as is and improve that later in another PR.