Add some checking to usage 2