PLA-1249 Fixed Typos and added exception