[ticket/416] Only allow adding module more than once on proper modules

B3P-416