Fixed problem with fatal errors