WebApi esxception handling in progress
Commit after merge