Update exception handling + add extra space for partitioning
Mostly working script for SL5