Add extra checks for properties that may not exist
Added current version of API this port is based on, for diff purposes