Add short-circuit for Smart Assemblies + include extra error info