Typo
Better error handling