New STBP layering
Fix exception type in Model (ValueError)