Some fixes due to not checking anything before