v1.0.5 Fixed exceptions