Added error handling and Locu support