fix #406; additionally removed some safe_mode related code since it's deprecated
fix #406; additionally removed some safe_mode related code since it's deprecated
mmauri04/prado,mmauri04/prado,majuca/prado,majuca/prado,mmauri04/prado,majuca/prado