Added proper exception for unparseable input
Added mapping of ReferenceNotFound to 404