Added one more error handling thing