Adding in initial exception refactor