Fixes for fatal error when there's an empty street