Minor style issue.
Better error handling.