Updated some exception throwing to use Spring exceptions