More defensive programming.
Version 0.2.5
Version 0.2.6-SNAPSHOT