improve error handling and fix some controller answer