Fixed issues without checkout and added validation message
Merge