Make more script friendly (throw exception vs die) and a few other tweaks