Added error checking.
New counts.