Fix typo
Improve logging
Add informative checks