Server Properties

Added error checking