Replace NPE with proper exception message
Expose parameter to skip some type of engine.