Added stronger register checking