Include README.org into the system
Better error handling