Cleanup some exceptions in layout manager