some fixes for elb stuff - don't crash on error