Added more error raising

Exception is a placeholder