Better error handling.
Added contents.