Fixed script building, removed some un-needed error checking.