Sorted out the null