Better action in case of error.
Bugs fixed.