Added exception type to catch; using Identity helper
Fixed null ref exception