Small adjustments
Catch errors if they get generated