Changes to SUSHI handling to report more meaningful errors

Main code rev. 2012