Fix salt marsh issue, better error feedback