Optimizing register error checking
More error checking
More error checking