protect against null values
Version 0.1.1