Added a check and fixes for model object that are not serializable