Added some checks to post_deploy