Retain fragment instances
Improve error handling