Fixed possible crashes
Ready for Market Build