Added error handling, we need way to handle queue