Revised properties parsing to make it more error tolerant