Make more strict with better logging