Support running master as a library call; UserError support