Add some null checks!