Some more checks if everything is ok