more defensive programming
2.1.0