Removing commented code
Removing comment code
Adding error alert
Cleaning up comment code