Add method to throw no null if condition is met