Removed special try/catch for the null test