This null validation needs to be added back in...