Fixed missing semicolons. Also added checking for unfound items.