Added catching. Wow that was easy.