Added error handling
commit with authors