Updated to include Excon handling