Final checks before the return

Final checks before the return