Incorporate code review comments
Incorporate code review comments

Fix error message
Change the order of if/else

bitti/voldemort,birendraa/voldemort,arunthirupathi/voldemort,bitti/voldemort,jwlent55/voldemort,arunthirupathi/voldemort,jalkjaer/voldemort,rickbw/voldemort,null-exception/voldemort,bitti/voldemort,stotch/voldemort,bitti/voldemort,arunthirupathi/voldemort,arunthirupathi/voldemort,PratikDeshpande/voldemort,voldemort/voldemort,birendraa/voldemort,birendraa/voldemort,FelixGV/voldemort,gnb/voldemort,squarY/voldemort,PratikDeshpande/voldemort,bhasudha/voldemort,mabh/voldemort,gnb/voldemort,arunthirupathi/voldemort,bhasudha/voldemort,squarY/voldemort,cshaxu/voldemort,voldemort/voldemort,dallasmarlow/voldemort,arunthirupathi/voldemort,squarY/voldemort,null-exception/voldemort,stotch/voldemort,FelixGV/voldemort,jwlent55/voldemort,dallasmarlow/voldemort,null-exception/voldemort,bhasudha/voldemort,jwlent55/voldemort,voldemort/voldemort,jalkjaer/voldemort,gnb/voldemort,squarY/voldemort,rickbw/voldemort,dallasmarlow/voldemort,jeffpc/voldemort,rickbw/voldemort,squarY/voldemort,stotch/voldemort,HB-SI/voldemort,LeoYao/voldemort,rickbw/voldemort,HB-SI/voldemort,PratikDeshpande/voldemort,dallasmarlow/voldemort,LeoYao/voldemort,jwlent55/voldemort,birendraa/voldemort,null-exception/voldemort,mabh/voldemort,jeffpc/voldemort,PratikDeshpande/voldemort,bhasudha/voldemort,FelixGV/voldemort,cshaxu/voldemort,jalkjaer/voldemort,LeoYao/voldemort,mabh/voldemort,FelixGV/voldemort,HB-SI/voldemort,PratikDeshpande/voldemort,cshaxu/voldemort,cshaxu/voldemort,FelixGV/voldemort,LeoYao/voldemort,LeoYao/voldemort,bitti/voldemort,stotch/voldemort,gnb/voldemort,bitti/voldemort,null-exception/voldemort,voldemort/voldemort,jalkjaer/voldemort,stotch/voldemort,birendraa/voldemort,arunthirupathi/voldemort,dallasmarlow/voldemort,FelixGV/voldemort,dallasmarlow/voldemort,jeffpc/voldemort,PratikDeshpande/voldemort,HB-SI/voldemort,voldemort/voldemort,jalkjaer/voldemort,bitti/voldemort,jwlent55/voldemort,jwlent55/voldemort,mabh/voldemort,cshaxu/voldemort,null-exception/voldemort,jalkjaer/voldemort,rickbw/voldemort,gnb/voldemort,gnb/voldemort,mabh/voldemort,HB-SI/voldemort,FelixGV/voldemort,mabh/voldemort,jeffpc/voldemort,birendraa/voldemort,HB-SI/voldemort,bhasudha/voldemort,voldemort/voldemort,bhasudha/voldemort,stotch/voldemort,LeoYao/voldemort,jalkjaer/voldemort,jeffpc/voldemort,squarY/voldemort,voldemort/voldemort,squarY/voldemort,rickbw/voldemort,jeffpc/voldemort,cshaxu/voldemort