Minor fixes & safeguards for 2.4.1 by Yuri Censor

Minor fixes & safeguards for 2.4.1 by Yuri Censor