Relax dependencies with PVP upper bounds
Use qualified catch to avoid warnings