diff --git a/main/features.c b/main/features.c
index ab376f9c72..f48982c6b9 100644
--- a/main/features.c
+++ b/main/features.c
@@ -502,6 +502,8 @@ static struct parkeduser *park_space_reserve(struct ast_channel *chan,
 	
 	if (peer)
 		parkinglotname = findparkinglotname(peer);
+	else /* peer was NULL, check chan (ParkAndAnnounce / res_agi) */
+		parkinglotname = findparkinglotname(chan);
 
 	if (parkinglotname) {
 		if (option_debug)
@@ -818,7 +820,7 @@ static int masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, i
 	return 0;
 }
 
-/* Park call via masquraded channel */
+/* Park call via masqueraded channel */
 int ast_masq_park_call(struct ast_channel *rchan, struct ast_channel *peer, int timeout, int *extout)
 {
 	return masq_park_call(rchan, peer, timeout, extout, 0, NULL);