Reverted unnecessary exception and match conditions