cleaned up no layer / no fields error handling