Mansi,Aravind | #44 | Handling edge cases