Refactor exceptions
Remove unncessary code to build identifier field