Better to return None, rather than raise an exception (to get admin working) + package info typo fix