Better error handling. Minor text changes