Add some checking