Catch more errors and change max Map size