NTheEndAgain - Added missing Null-check