removed commented out try-catch