Method for improved handling of emergency calls of a user equipment being connected to a wireless access point while initiating an emergency call, wherein the user equipment is able to be connected to a mobile communication network via the wireless access point that is connected to an external packet data network, the mobile communication network comprising a core network and a radio access network, wherein the core network is a mobile enhanced packet core network and the access point is a WiFi access point, wherein the method comprises a first and a second step: -- in the first step, the user equipment - while being attached to the mobile communication network - receives an emergency call capability information, the emergency call capability information being indicative of the mobile communication network providing the possibility of an emergency service towards the user equipment in case it is connected to the core network via the wireless access point, -- in the second step and in case that an emergency call needs to be initiated by the user equipment while the user equipment is attached to the mobile communication network via the wireless access point, the user equipment initiates the emergency call via the wireless access point in case that the emergency call capability information indicates that the mobile communication network provides the possibility of an emergency service towards the user equipment while being connected to the core network via the wireless access point, wherein the user equipment is connected - while initiating the emergency call - via the wireless access point to the mobile communication network using a data transmission tunnel between the user equipment and an evolved packet data gateway that is part of the core network, and the user equipment initiates the emergency call using an access network of the mobile communication network different from an access network comprising the wireless access point in case that the emergency call capability information indicates that the mobile communication network is unable to provide the possibility of an emergency service towards the user equipment that is connected to the core network via the wireless access point. -- in the first step, the user equipment - while being attached to the mobile communication network - receives an emergency call capability information, the emergency call capability information being indicative of the mobile communication network providing the possibility of an emergency service towards the user equipment in case it is connected to the core network via the wireless access point, -- in the second step and in case that an emergency call needs to be initiated by the user equipment while the user equipment is attached to the mobile communication network via the wireless access point, the user equipment initiates the emergency call via the wireless access point in case that the emergency call capability information indicates that the mobile communication network provides the possibility of an emergency service towards the user equipment while being connected to the core network via the wireless access point, wherein the user equipment is connected - while initiating the emergency call - via the wireless access point to the mobile communication network using a data transmission tunnel between the user equipment and an evolved packet data gateway that is part of the core network,