Added handling for when source data contains incorrect information (see Issue #24)