Improve error messages
Add 'No object found' handling