Adding some proper checks