master - switched load order, added string exception stuff
master - added conditions