fix: Changed logic for exception handling (#76)

fix: Changed logic for exception handling (#76) #72