Changed out try/catch for a real check