added is defined check for album