Error fix, added alert popup