Added safety to score compilation to avoid crashes
Minor changes