adapted assert message, removed warnings