#28 Replaced assert() calls with if/else/raise <Exception>()#30