Added error code to exception message if Message is missing