added some defensiveness
0.1.2