Neat error handling and update titles