Added some checks to post