Feature/better import errors

| Q                   | A
| ------------------- | ---
| Bug fix?            | No
| New feature?        | No
| BC breaks?          | No
| Tests pass?         | ?
| Scenarios pass?     | ?
| Checkstyle issues?  |
| Changelog updated?  |
| Fixed tickets       |
| Doc PR              |

Better import errors, can certainly be done in a better way