Fixed crashes from report