Better exception handling in Splicer
Merge branch 'dev'