Only use catch() for Promises when necessary