Fixed returning of focus by removing end commands and improved error message text.
Updated date.